Serverside files.
Merge remote-tracking branch 'Sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/test.db/db.lck
	TGOHServerside/test.db/log/log.ctrl
	TGOHServerside/test.db/log/log1.dat
	TGOHServerside/test.db/log/logmirror.ctrl
Mergin with Jason
Fixed up the inability to delete notifications
Don't know why I need to commit this.  I just reomved white space...
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
Working on fixing Announcements when dealing with null error.
Merge remote-tracking branch 'Jason/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java