- Sending encrypted password back to user (temporary!)
Merge origin/master

Conflicts:
	app/views/welcome.blade.php