hack to fix map
Merge branch 'devel' of github.com:Exartu/Exartu-CRM into devel