* Added ID to query GuideContainer
* Added query guide visualizations
Merge branch 'master' of https://github.com/otavanopisto/edelphi.git

Conflicts:
	edelphi/src/main/webapp/_scripts/gui/panel_admin/queryeditorblockcontroller.js
	edelphi/src/main/webapp/jsp/pages/panel/admin/createquerypage.jsp