workspace specific settings
Merge branch 'aws' of https://github.com/IVPR/Weave.git into aws
Revert "workspace specific settings"

This reverts commit 24d5fede7ee6bd724adc64001109619c87319107.
workspace specific settings
progress on uploading a queryobj and populating the UI
Merge branch 'aws' of https://github.com/IVPR/Weave.git into aws

Conflicts:
	AWS/app/js/services/services.js
fix to services