added multiple fixes
Merge branch 'xcolab_refactoring' of https://github.com/jintrone/XCoLab into xcolab_refactoring

Conflicts:
	portlets/adminstasks-portlet/src/main/java/org/xcolab/portlets/admintasks/migration/persistence/NewPersistenceCleaner.java
fixed typo