Service work
Merge remote-tracking branch 'upsteam/master' into card

Conflicts:
	app/template/template.php
	css/style.css