fixed some config stuff
Merge branch 'master' of https://github.com/eblipsky/NOW-web