Merge branch 'master' of https://github.com/sharewave/frontus
Merge branch 'awesome'
css changes on icons fixes #761
Merge branch 'master' of https://github.com/sharewave/frontus
Bug fix. Undoing a commit with an unhelpful comment, so don't know what it was supposed to do.
Merge branch 'master' into testing