fixed reloading
Fix merge conflict and add in owrkin gpeople
Merge branch 'testing' of https://github.com/sharewave/frontus into testing