Merge branch 'Validations'
Merge branch 'Validations'
kjh
Dooo some stuff
Merge branch 'master' of https://github.com/chrismayr/YourChoice_Server

Conflicts:
	data/users.db
do some more stuff
Merge branch 'Validations'
Done: #13, #11, #5, #4