initial commit of demo game
Merge branch 'develop'

* develop:
  server tweaking
  removing commented code
template and less cleanup