commit
Merge branch 'dev'

Conflicts:
geotracking/Resources/Icon.png
geotracking/Resources/Icon@2x.png