no message
Merge branch 'master' of https://github.com/yasutoshi0704/hackathon

Conflicts:
	fuel/app/classes/controller/member.php
	fuel/app/classes/model/member.php