Done
Merge branch '2-0' of github.com:CreativeMobile/socmap_adf into 2-0