content class
Merge branch 'master' of https://github.com/4RN4LDO/Alfresco

Conflicts:
	createContent.java