Merge branch 'master' of https://github.com/doyomeki/matsuri2
refs #63 change timetable format timestamp
Merge branch 'master' of https://github.com/doyomeki/matsuri2
modify seeds and show br
refs #9 fix imagesize
modify seeds and show br
message develop to master
Merge branch 'develop'
refs #9 mod content layout
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
Merge branch 'master' into develop
modify seeds
Merge branch 'develop'
add Herok add on New Relic config
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
change contents image path for intranet
Merge branch 'master' of https://github.com/doyomeki/matsuri2 into develop
Merge branch 'master' into develop
 fix image_path in contents/index
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop