fixed error on persist
Merge branch 'master' of https://singhj2014@bitbucket.org/Shadeven/cerebrumehr.git
resolving commit
mdl
added maven plugin
moved user util
fixed imports
11
Merge branch 'master' into wust_dev

Conflicts:
	src/model/model-export/UML_Standard_Profile.MagicDraw_Profile.DSL_Customization.profile.uml
	src/model/model-export/UML_Standard_Profile.MagicDraw_Profile.profile.uml
	src/model/model-export/UML_Standard_Profile.UML_Standard_Profile.profile.uml
	src/model/model-export/UML_Standard_Profile.Validation_Profile.profile.uml
	src/model/model-export/model.uml
	src/model/model-export/wcprofile.profile.uml
	src/model/model.mdzip
	src/test/java/com/oreon/cerebrum/web/action/admission/AdmissionActionTest.java