Finishing touches
Fixing merge conflicts
Merge branch 'testing' of https://github.com/sharewave/frontus into testing