Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
Merge remote-tracking branch 'Sam/master'
Capped all text boxes at 30 characters (except for the one that is at
10).
Merge remote-tracking branch 'Cody/master'
Created Settings page.  Implemented part, if not all, of each the
buttons.
Merge remote-tracking branch 'JasonFiddle/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/IDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java