Merge branch 'master' of https://github.com/wim82/FrontEnd-MeetingRoom

Conflicts:
	Cronos Rooms/App/AppDelegate.m
Merge remote-tracking branch 'origin/master'