[TASK] ADWD-1368 reset map only when necessary
Merge pull request #167 from snaegle/ADWD-1368

[TASK] ADWD-1368 reset map only when necessary
[TASK] Load piwik asynchronous
Merge pull request #1 from subugoe/develop

Develop