#4 closed

login, reset password and sign up pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml