useless
Merge branch 'master' of https://github.com/Jugendhackt/hackspace-dashboard

Conflicts:
	checkInOut.php
Merge branch 'master' of https://github.com/Jugendhackt/hackspace-dashboard