refs #9 mod content layout
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop

Conflicts:
	app/views/events/_time_table.html.haml
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
add entry
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop