no message
Merge branch 'develop' of https://github.com/scenarioo/scenarioo into develop

Conflicts:
	scenarioo-client/app/views/manage/branchAliases.html
	scenarioo-client/package.json
	scenarioo-client/test/protractorE2E/specs/k_branchalias_spec.js
	scenarioo-client/test/protractorE2E/specs/manage_spec.js