Merge branch 'master' into development
case 3211 - Make AJAX request only once, set correct item type markers link.
case 3211 - Fix for collection items js error.
case 3211 - Corrected item link path.
Merge branch 'hotfix'