changes to admin
conflictMerge branch 'areena-feb28' of https://github.com/arunphilip03/SalesAutomation

Conflicts:
	.data/00000000/00000001.jdb
	.data/00000000/00000002.jdb
	Model/classes/.data/Model.cdi
	Model/classes/META-INF/adfm.xml
	Model/classes/com/sfa/model/JDev2807224243386890295.properties
	Model/classes/com/sfa/model/JDev3029456179121888973.properties
	Model/classes/com/sfa/model/JDev3565168915820665264.properties
	Model/classes/com/sfa/model/JDev4739636012077834810.properties
	Model/classes/com/sfa/model/JDev848898656601649821.properties
	Model/classes/com/sfa/model/JDev878480575539239211.properties
	Model/classes/com/sfa/model/ModelBundle.properties
	Model/classes/com/sfa/model/VO/CustomerContactsView.xml
	Model/classes/com/sfa/model/VO/RoleAssignmentView.xml
	Model/classes/com/sfa/model/VO/UsersView.xml
	Model/classes/com/sfa/model/VO/ValidRolesView.xml
	Model/classes/com/sfa/model/entity/AppointmentInvitees.xml
	Model/classes/com/sfa/model/entity/CustomerContacts.xml
	Model/classes/com/sfa/model/service/AppModule.xml
	Model/src/com/sfa/model/ModelBundle.properties
	ViewController/classes/.data/ViewController.cdi
	ViewController/classes/META-INF/task-flow-registry.xml
	ViewController/classes/com/sfa/view/DataBindings.cpx
	ViewController/classes/com/sfa/view/backing/Launcher.class
	ViewController/classes/com/sfa/view/backing/RefreshView.class
	ViewController/classes/com/sfa/view/pageDefs/admin_product_mainPageDef.xml
	ViewController/classes/com/sfa/view/pageDefs/admin_roleAssign_createPageDef.xml
	ViewController/classes/com/sfa/view/pageDefs/admin_role_mainPageDef.xml
	ViewController/classes/com/sfa/view/pageDefs/admin_user_createPageDef.xml
	ViewController/classes/com/sfa/view/pageDefs/admin_user_roleassignPageDef.xml