Update conf
Merge branch '0.1' into 0.2
Merge branch '0.2' of github.com:novius-os/documentation-en into 0.2