Merge branch 'dev' of https://github.com/AndlyticsProject/andlytics
Merge branch 'dev' of https://github.com/AndlyticsProject/andlytics
Merge branch 'dev' of https://github.com/AndlyticsProject/andlytics
Merge branch 'dev' of https://github.com/AndlyticsProject/andlytics
lint errors fixed (double namespace declaration)
icon and language formatting, see discussion pull #372
changed padding right
Merge pull request #378 from AndyScherzinger/master

 icon and language formatting, see discussion pull #372