check-in changes from mobile
Merge branch 'master' of github.com:GazeboHub/lupine-m2