Make User consistent with Class Diagram
Merge branch 'master' of https://github.com/withlovee/easy

Conflicts:
	app/views/layouts/master.blade.php
Merge branch 'master' of https://github.com/withlovee/easy