Added client logins
Merge branch 'master' of https://github.com/tijs14tijs/ROAD

Conflicts:
	.idea/workspace.xml