Merge origin/master

Conflicts:
	app/controllers/ServiceController.php
	app/views/service/view_service.blade.php
Merge origin/master