adding login page stuff
Added Stephen's files
Create user page
change password fields and error syntax
Merge branch 'jamie' into dev

Conflicts:
	index.php
Merge branch 'stephen' into dev