Updated files
Merge branch 'master' of https://github.com/scottyd980/Tranquility

Conflicts:
	app/modules/auth/controllers/signup.js
Added "remember me" functionality.