updates view
Merge remote-tracking branch 'origin/master'

* origin/master:
  Added Resque Job for Fighting
  updated technology helper
  little changes in spyreport
  building Buildings works now
  Messaging system fixes
  updated technology helper and edited view