Merge branch 'master' of http://github.com/jtakayama/makahiki
Merge branch 'master' of http://github.com/jtakayama/makahiki into one-page-configuration