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

Conflicts:
	AWS/app/css/app.css
	AWS/app/index.html
Fixing merge conflicts