Merge branch 'master'

Merge branch 'master' of https://github.com/getsmap/smap-mobile