vjs - version bump to 1.2.2
remove spacing to do
fix bugs in combat.resetDialog - multiple monsters works again
combat HTML was moved into index long ago
Merge branch 'master' into chrome-app

* master:
  combat HTML was moved into index long ago
  fix bugs in combat.resetDialog - multiple monsters works again
  remove spacing to do
  vjs - version bump to 1.2.2