Changed title
fixes
Merge branch 'hosted_devel' into hosted

Conflicts:
	hostedapp/manifest_dell.json
	hostedapp/manifest_git.json