bug fixes
Merge branch 'staging' of github.com:robwhitaker/Asylum-Jam-2013 into staging
bug fixes for days
FF warning