settings commited
Cms image path setting added
assets reorganized
assets reorganized
Merge branch 'master' of github.com:softwareplanet/cms

Conflicts:
	softwareplanet-cms/CMS_VERSION