35: Password field will be changed in another story so it will require typing password twice
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
31: custom 500 page