Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/controller/GetUserController.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/RegistrationForCourses.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
almost finished with the server side
worked a little bit with the controllers
Merge remote-tracking branch 'jason/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/controller/GetUserController.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/RegistrationForCourses.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
Fixed the Serverside's changing password and implemented in the client
side. Also fixed error in the serverside and client side.
Mergin with Jason
Fixed up the inability to delete notifications
Merge remote-tracking branch 'Sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/derby.log
	TGOHServerside/test.db/db.lck
	TGOHServerside/test.db/log/log.ctrl
	TGOHServerside/test.db/log/log1.dat
	TGOHServerside/test.db/log/logmirror.ctrl