user+client_client configurations

User GUI and Controller+Client GUI and controller+configuration GUI and
controller
Merge branch 'master' of https://github.com/braude-spring-2014/Project

Conflicts:
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.history/1c/80fdc207a2e9001312c5e68c3834f7ea
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.history/3b/20f2a7eda1e9001312c5e68c3834f7ea
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.history/b0/40e1111aa2e9001312c5e68c3834f7ea
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.history/cb/50c5bf7322eb00131e0b8414ff4d8393
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.history/f0/c03c9d3ea3e9001312c5e68c3834f7ea
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIClient/.indexes/e4/35/3b/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIClient/.indexes/e4/35/a9/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIClient/.indexes/e4/95/3f/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIClient/.indexes/e4/aa/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIClient/.markers
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIClient/org.eclipse.jdt.core/state.dat
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIServer/.indexes/e4/95/3f/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIServer/.indexes/e4/9d/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIServer/.indexes/e4/aa/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIServer/.indexes/e4/bd/b9/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIServer/.indexes/e4/e8/history.index
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIServer/.markers
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.projects/SGIServer/org.eclipse.jdt.core/state.dat
	Java
Code/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Java
Code/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	Java Code/.metadata/.plugins/org.eclipse.jdt.core/2291935389.index
	Java Code/.metadata/.plugins/org.eclipse.jdt.core/364247358.index
	Java
Code/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Java Code/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Java
Code/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	Java Code/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	Java
Code/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SGIClient/2014/6/23/refactorings.history
	Java
Code/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/SGIClient/2014/6/23/refactorings.index
	Java
Code/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	Java Code/SGIServer/bin/server/database/Database.class
Merge branch 'master' of https://github.com/braude-spring-2014/Project