new icons / test repaired / cockpit fixxed
Finish gui
icons path fixxed
Merged 'dev'.

Conflicts:
	app/shared/cmCrypt.js
	app/shared/cmUserModel.js
	test/unit/shared/cmUserModel.fix.spec.js