Automated commit at 2014-07-16 09:05:43 UTC by middleman-deploy 3.2.2
コンフリ解消
各種修正
build後