Merge branch 'master' into gh-pages
gun now shoots in both directions
players can now be shot (and killed)
players now get points for killing other players
roles now changed to rules
player now disappears on gun death
added vending machine (blank object)
cropped vending machine sprite
fixed image/sprite issues
content pack template changes
map and collision amendments
redesigned scraproom map
new sprites and additional room decoration
more room decorations
now using templates directories instead of views
right section now split into 3 tabs
inventory now accordion again
deleted old patchwork files
fixed bug with bad inventory ids
further inventory improvements