update query
update query
Merge branch 'master' of https://github.com/Nomyx/GUN_TER

Conflicts:
	Query/Query2.rq