Changed MooTools based color picker (MooRainbow) to a jquery/bootstrap based colorpicker (miniColors)
Update color.php
Changed MiniColors to Bootstrap template (and customized it a bit)
Merge branch 'colorpicker' of https://github.com/nonumber/joomla-cms into colorpicker
Added rounded corners and cursor pointer to swatches
Added 'simple' control type
Fixed some comments
Changed a bit of styling
Changed a bit of styling
Merge remote-tracking branch 'remotes/upstream/master' into colorpicker
Removed MooRainbow media files
Merge remote-tracking branch 'remotes/upstream/master' into colorpicker
Changed position of the color picker panels to the right
Merge remote-tracking branch 'remotes/upstream/master' into colorpicker

Conflicts:
	libraries/joomla/form/fields/color.php
Fixed conflicts with merge
[#30382] Fatal error in mod_weblinks (Fix #893)
[#30142] Add optional class param to accordion slider (Fix #731)
[#30387] Remove compact.xml (Fix #896)
 $ Updating installation ini files: pt-BR, ckb-IQ
Merge remote-tracking branch 'remotes/upstream/master' into colorpicker