Merge branch 'release/1.0.0'

diff --cc header.php
index 8a789e7,75c6282..d15fdc9
--- 1/header.php
--- 2/header.php
+++ b/header.php
@@@ -7,9 -7,9 +7,10 @@@
  <meta http-equiv="imagetoolbar" content="false">
  
  <?php wp_head();?>
 +<link rel="shortcut icon" href="<?php echo get_template_directory_uri(); ?>/favicon.ico">
  <link rel="stylesheet" href="<?php bloginfo('template_url'); ?>/css/foundation.css" />
  <link type="text/css" rel="stylesheet" href="<?php echo get_template_directory_uri();?>/qs.css">
+ <link rel="shortcut icon" href="<?php echo get_template_directory_uri(); ?>/favicon.ico">
  <link type="text/css" rel="stylesheet" href="<?php echo get_stylesheet_uri();?>">
  <!-- Google Analytics Code -->
  </head>