Merge remote-tracking branch 'pk/network_containers' into develop
Added stub files to prevent verbose warnings from scaring the unwashed masses with bad sounding errors.
Merge pull request #590 from rcythr/fsm_fixes

Fsm fixes
Bugfix for sql script

Fixed a bug which caused all single db options to install only the last db.
Merge pull request #591 from rcythr/develop

Bugfix for sql script
Merge remote-tracking branch 'anh/develop' into develop
Resize after compression.
Merge pull request #592 from apathyboy/decompression_fix

Decompression fix
Check if collider or one of it's inner objects has a controller to award a badge.
Add the badge to the scene directly with AddObject since it has no controller
Fixed a bug i introduced a while back
Added self test check for collision detection
Merge pull request #593 from apathyboy/badge_fix

Badge fix
Merge branch 'develop' into feature/chat