Small changes
Merge branch 'master' of https://github.com/Nick-Kontos/Whiteboard.git

Conflicts:
	WhiteBoard/grails-app/views/templates/_viewAssignments.gsp