Merge branch 'aws' of https://github.com/IVPR/Weave.git into aws

Conflicts:
	AWS/app/js/controllers/panelControllers.js
	AWS/app/js/services/services.js
	AWS/app/tpls/ScriptOptionsPanel.tpls.html