Work in progress
Merge branch 'master' of https://github.com/slipstream/SlipStreamUI

Conflicts:
	src/slipstream/ui/views/authorization-edit.html
	src/slipstream/ui/views/authorization-view.html
	src/slipstream/ui/views/byebye.html
	src/slipstream/ui/views/configuration.html
	src/slipstream/ui/views/css/sixsq.css
	src/slipstream/ui/views/deployment-edit.html
	src/slipstream/ui/views/deployment-view.html
	src/slipstream/ui/views/documentation.html
	src/slipstream/ui/views/error.html
	src/slipstream/ui/views/header.html
	src/slipstream/ui/views/image-edit.html
	src/slipstream/ui/views/knockknock.html
	src/slipstream/ui/views/layout.html
	src/slipstream/ui/views/project-edit.html
	src/slipstream/ui/views/project-view.html
	src/slipstream/ui/views/welcome.html
Adjustments following merge