Merge origin/natu

Conflicts:
	app/routes.php
	app/views/service/index.blade.php
	app/views/site/user/services.blade.php