include colors in url
Merge branch 'dev'
version bump