aws changes
Merge branch 'master' of https://github.com/alexrpagan/xfertest

Conflicts:
	src/viewservice/common.go