preparing for maintenance release
Merge pull request #471 from nelenkov/master

preparing for maintenance release
Merge branch 'master' of https://github.com/AndlyticsProject/andlytics into dev
Merge pull request #472 from AndyScherzinger/dev

2.5.5 release changes master-->dev