Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHProject/res/layout/teacher_notification_page.xml
	TGOHProject/res/values/strings.xml
Ready to merge!
Merge remote-tracking branch 'Sam/master'

Conflicts:
	TGOHProject/res/layout/teacher_notification_page.xml
	TGOHProject/res/values/strings.xml
Merge remote-tracking branch 'Cody/master'
Fixed errrors
Merge remote-tracking branch 'Cody/master'

Conflicts:
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/pesist/RealDatabase.java
	TGOHServerside/src/edu/ycp/cs/cs496/TGOH/servlet/RegistrationForCourses.java
Fixed bug with Teacher Notification Page
fixed double access of controller.
fixing up little things
Merge remote-tracking branch 'CodyHoward/master'
Merge remote-tracking branch 'JasonFiddle/master'

Conflicts:
	TGOHProject/res/layout/teacher_notification_page.xml
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java