Error Messages

Working on error message
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	application/views/user/login.php