Merge branch 'master' into development
User authentication
Merge pull request #2 from InfinityHoldings/User-authentication

User authentication
Server Create User
Overloaded Entourage Constructor
uc
Merge pull request #3 from InfinityHoldings/ServerCreateUser

Server Create User
Adjusted IP address for server connectivity
Committing server changes: User existence
Merge branch 'development'

Conflicts:
	EntourageApp/app/controllers/UserController.java
	EntourageApp/conf/routes