synced prefs
updated to gae 187
Revert 851b988..c708ed8

This rolls back to commit 851b9887331922a3e74f08028c089db69fed34ae.
updated to jdk7 and added in proper gae library
synced webxml
Merge branch 'master' of https://github.com/YOLOcs361/Project

Conflicts:
	war/WEB-INF/web.xml
Merge branch 'master' of https://github.com/YOLOcs361/Project

Conflicts:
	war/WEB-INF/web.xml
Merge branch 'master' of https://github.com/YOLOcs361/Project
Revert a4397fa..516b9b3

This rolls back to commit a4397fa656a8c857536d417fc56bb896492b9f10.
Merge branch 'master' of https://github.com/YOLOcs361/Project