Update and simplify the sample container
Merge branch 'dev' of github.com:chb/smart_sample_apps into dev