Work User Login
Merge https://github.com/minardi/mts-dip

Conflicts:
	app/assets/stylesheets/total_style.css