some small bug fixed in cntroller queries
cleaned
Merge branch 'master' of https://github.com/Nick-Kontos/Whiteboard.git

Conflicts:
	WhiteBoard/target/stacktrace.log