store map fixed
popup fixed
Merge pull request #38 from Jero786/MYG000-95

Myg000 95
Merge branch 'master' into DEMO-28-11