Merge remote-tracking branch 'Cody/master'

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MainWorld.java
	GamingWebsite/src/edu/ycp/cs320/gamingwebsite/shared/Player.java
Some work on main world and on the junits
added a back to homescreen button