Merge branch 'master' into Sharon
Merge branch 'master' into Sharon
preparing to start new dashboard
Merge branch 'master' into Sharon
Merge branch 'master' into Sharon

Conflicts:
	app/views/dashboard/index.blade.php
change to user app
Merge branch 'master' into Sharon

Conflicts:
	app/models/User.php
all security fixed
Merge pull request #73 from blind-squirrel/Sharon

Sharon