minor ui change
Merge branch 'master' of https://github.com/laureandrieux/MeetMeHack2014

Conflicts:
	.idea/workspace.xml