Merge branch 'master' of https://github.com/ynleborg/gmgapp into HEAD

Conflicts:
	gmgapp-war/src/main/webapp/gmgapp.jsp