updated for color picker and integration settings
Merge branch 'master' of https://github.com/iamlalit/olympia-volunteer-blue