edit
Merge branch 'master' of https://github.com/ovidio43/CRM_sudelaer

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