Massa fixes
Updated with Backgrounds and also fixed some errors with Live Objects
Merge pull request #134 from CarlRapp/TENFIRE

Tenfire
Merge pull request #135 from CarlRapp/TENFIRE

Tenfire
Merge pull request #136 from CarlRapp/master

Update