home page
Merge branch 'master' into localBranch

Conflicts:
	UI/app/controllers/user.js
	UI/app/models/UserRest.js
	UI/app/routes.js
	UI/app/views/welcome.jade
	UI/config/rest_api.js
Merge pull request #18 from vivenkat/localBranch

Local branch