- custom server instead of endnotes
Merge branch 'GCM' of https://github.com/shkryaba/scav into GCM

Conflicts:
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	Scav-AppEngine/src/edu/uchicago/scav/Item.java
	Scav-AppEngine/src/edu/uchicago/scav/ItemEndpoint.java
	Scav-AppEngine/src/edu/uchicago/scav/Player.java
	Scav-AppEngine/src/edu/uchicago/scav/Team.java
	Scav-AppEngine/war/WEB-INF/web.xml