fix date
change brijj call
small changes
try to add a service
Fix merge conflict
Merge branch 'testing' of https://github.com/sharewave/frontus into testing