Fixed controllers
Merge remote branch 'origin/master' into JJ-GKG-GUI-3

Conflicts:
	src/main/webapp/js/controllers.js