changed back to timepicker
todo: calculate time differences
Merge branch 'master' of https://github.com/schreon/matchmaking

Conflicts:
	matchmakingclient/src/main/res/layout/startmatchsearch.xml