Merge branch '19-improve-activity-view' into autocompletion

Conflicts:
	Resources/public/js/core/model/base.js
	Resources/public/js/core/model/customer.js
	Resources/public/js/core/model/project.js
	Resources/public/js/core/model/service.js