fix computed/container_options; refactoring; bug fixes
Merge branch 'master' of github.com:droidlabs/motion-prime