Changed MiniColors to Bootstrap template (and customized it a bit)
Merge branch 'colorpicker' of https://github.com/nonumber/joomla-cms into colorpicker