Add dropbox support for login
Merge branch 'master' of https://github.com/stayradiated/Nitro

Conflicts:
	app/controllers/auth.coffee