Merge branch 'master' of https://github.com/doyomeki/matsuri2
Merge branch 'develop'
Merge branch 'develop'
modify user's seed enable to use only develpment
delete public/assetes
Merge branch 'develop'
Merge branch 'master' of https://github.com/doyomeki/matsuri2
modify default picture
Merge branch 'develop'
Merge branch 'develop'
modify Top pages Logo
Merge branch 'develop'
fix layout
Merge branch 'master' of https://github.com/doyomeki/matsuri2 into develop
refs #62 modify current password from text field to password field