moved some settings from base to local
Merge branch 'master' of https://github.com/Pshrub/office-poll-topic