RClient testing and Time Logging
Merge branch 'aws' of https://github.com/IVPR/Weave.git into aws

Conflicts:
	AWS/app/index.html