Bulk changes before hiding properties files from public git
Merge branch 'master' of https://github.com/jaav/r2s

* 'master' of https://github.com/jaav/r2s:
  Hiding aws keys

Conflicts:
	conf/application.conf