Documentation recompiled
Merge branch 'master' of github.com:softwareplanet/cms

Conflicts:
	README.md