sync commit to do pull, work in progress
Merge branch 'master' of https://github.com/hugoleandersson/TravelMatch

Conflicts:
	php/loginHandler.class.php

‘