updated front
Merge branch 'dev' of github.com:novius-os/core into dev