remove mains
added update to entity
add player to entity list
removed static player in player
added interface Controllable
added controller
Merge branch 'master' of https://github.com/miketamis/towngame

Conflicts:
	src/main/java/com/TownGame/towngame/Player.java