added cockpit
.
added extra user
.
Version number changed
version changed
Merge branch 'V1.2'

Conflicts:
	metadata/manifest.yml