Add support for generic profile
Fix build
Merge branch 'master' into generic
Update credentials.mustache
Update credentials.mustache
Merge branch 'generic' into profile-config

Conflicts:
	config.json.enc
	tasks/credentials.mustache
renamed credentials to config