auto reload of state with pusher
Merge pull request #13 from RantGames/marker-labels

Initial implementation of city overlays instead of markers
merged with develop
Tidied PR to indendation standards
Merge pull request #15 from RantGames/pusher-state-refresh

auto reload of state with pusher
Merge branch 'develop' of https://github.com/RantGames/skirmish-web into gravatars-on-overlays

Conflicts:
	app.html