Merge branch 'dev' into feature/adding-and-removing-watchers

Conflicts:
	app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js
	karma/tests/controllers/work-package-details-controller-test.js
	lib/api/v3/work_packages/work_package_representer.rb