change edit.blade.php
Merge branch 'master' of https://github.com/alkop/laravel-foundation

Conflicts:
	app/views/user/edit.blade.php