commit to merge.
Merge branch 'develop' of github.com:da0shi/schedulab into develop

Conflicts:
	app/views/signup.php
modify error messages.