Pulling auth fixes
Merge branch 'master' of https://github.com/narendran/mycloud
Merge branch 'master' of https://github.com/narendran/mycloud

Conflicts:
	controller/controller.js