Tidied up for ClearOS 6 branching
Merge branch 'master' of github.com:clearos/webconfig

Conflicts:
	apps/mobile_demo