Merge remote-tracking branch 'jason/master'

Conflicts:
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/layout/teacher_main_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
clean up comments and update layouts
fixing up the database. making the selvets simplified
Merge remote-tracking branch 'sam/master'

Conflicts:
	TGOHProject/res/layout/request_page.xml
	TGOHProject/res/values/strings.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/Userpage.java
	TGOHServerside/war/WEB-INF/web.xml
Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHProject/res/layout/teacher_notification_page.xml
	TGOHProject/res/values/strings.xml