Merge branch 'master' of https://github.com/doyomeki/matsuri2
add Herok add on New Relic config
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
refs #69 add admin page of events(show)
change image file
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
Merge branch 'master' of https://github.com/doyomeki/matsuri2
Merge branch 'develop'
refs #70 add message for forgetting password