Merge branch 'master' into base_app
Merge pull request #1 from arduima/base_app

Merge branch 'master' into base_app