Merge branch 'kaznum-update_the_design'

まりめろさんのデザインアップデート対応
Merge remote-tracking branch 'smokeymonkey/master' into fix_map
Fix map marker location
Deployed at 2014-10-09 11:21:56 UTC by middleman-deploy 0.2.4