Update conf
Merge branch '0.2' into chiba.1
Merge branch 'chiba.1' of github.com:novius-os/documentation-api into chiba.1