Fixes
Merge branch 'sprk' of github.com:CreativeMobile/socmap-mp into sprk