rolend 8-17 18:51
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/views/commons/makeGroup.jsp
rolend 8-17 19:02