Fix market.jsp errors seen while attampting to sync
Merge branch 'master' of https://github.com/bigpolish7/jhu-plantgame

Conflicts:
	web/Market.jsp