modify
Merge branch 'develop' of https://github.com/ErythroME/Goo.git into develop
modify
Merge branch 'develop' of https://github.com/ErythroME/Goo.git into develop

Conflicts:
	application/controllers/LoginAction.php
modify
AdminMember
Merge branch 'develop' of https://github.com/ErythroME/Goo.git into develop
Merge branch 'develop' of https://github.com/ErythroME/Goo.git into develop

Conflicts:
	application/controllers/SignUpAction.php
	application/models/UserModel.php
	application/views/Public/Member/MemberLogin.php