Commit before merge.
Merge branch 'aws-temp' of https://github.com/IVPR/Weave into aws-temp

Conflicts:
	WeaveWorkstation/build/index.html