new feature [AWS]
remove AWS credentials from file [AWS]
new feature [AWS]
Initial Commit
Removed Sentitive Data
Merge branch 'master' of https://github.com/InfinityHoldings/Entourage

Conflicts:
	.gitignore
removing accidentally added files
Merge branch 'development'

Conflicts:
	EntourageApp/app/controllers/UserController.java
	EntourageApp/conf/routes
Updated Dev code
Updated Dev code (merged)