Merge branch 'stable'
[pedometerwidget] / welcome
1 just testing