Optimize resource handling
Merge branch 'master' of https://github.com/C3C0/GravityBox.git