removed, "None" option from colour picker swatch
Merge branch 'master' of github.com:Fabrik/fabrik
changed use exectute() rather than query() - also adding try / catch to db structural change queries (backported from 3.1)