Merge branch 'master' of heroku.com:socmap-ms-sprk into sprk
Merge branch 'sprk' of github.com:CreativeMobile/socmap-mp into sprk