Small fixes.
Small fixes.
Merge branch 'dbxAdv' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing