content assignment functionality.
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/src/com/contento3/web/site/PageUIManager.java
	cmsadmin/src/com/contento3/web/site/SiteContentAssignmentUIManager.java
updates
Merge branch 'develop' of https://github.com/contento3/Projects into develop