Merge branch 'master' of https://github.com/dzipet/webas

Conflicts:
	RestApi/Logic/QueriesManager.cs