Added color picker and friends
Merge branch 'master' of https://github.com/hack4reno2013/govoutside
merging
Merge branch 'master' of https://github.com/hack4reno2013/govoutside