Merge pull request #165 from subugoe/ADWD-1383-2

[TASK] ADWD-1383-2 check if borders button present
[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 #2 from subugoe/develop

Develop