Resolving multiple issues
Merge branch 'master' of https://github.com/horizon-institute/artmaps-wordpress