added features to Rservice for a timelog for step execution
can now embed a weave instance in index.html
Merge branch 'aws' of https://github.com/IVPR/Weave.git into aws

Conflicts:
	AWS/.externalToolBuilders/Ant Build.launch
	AWS/app/css/bootstrap.css