Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
For Carl to fix.
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