Changing all instances of userName to username
Completing userDao refactorings, including unit tests on UserDao
taking care of registration failure
Merge branch 'Task-1347' into develop

Conflicts:
	LoggedIn.php
	ManageUser.php
	submitRegistration.php