GroupComposite now has a unique way of linking users to different groups in AdminCP.
AdminCP now has a GroupComposite that is able to link users with different groups.
Merge branch 'master' of https://github.com/dvluong/assignment2
Conflicts:
	.metadata/.bak_0.log
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Assginment2/.indexes/af/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Assginment2/.indexes/e4/b6/67/70/a4/c0/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Assginment2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Assginment2/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/14.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.editor.common.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/test.launch
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3680216941.index
	.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Assginment2/2014/11/46/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Assginment2/2014/11/46/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Assginment2/2014/11/47/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/Assginment2/2014/11/47/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/.plugins/org.eclipse.wb.core/dialog_settings.xml
	.metadata/.plugins/org.eclipse.wb.swing/dialog_settings.xml
	.metadata/version.ini
	.recommenders/caches/identified-project-coordinates.json
	.recommenders/index/http___download_eclipse_org_recommenders_models_luna_/segments.gen
	.recommenders/repository/http___download_eclipse_org_recommenders_models_luna_/org/eclipse/recommenders/index/0.0.0-SNAPSHOT/resolver-status.properties
	Assginment2/src/edu/csupomona/cs/cs356/assignment_2/AdminCP.java
	Assginment2/src/edu/csupomona/cs/cs356/assignment_2/GroupComposite.java