extreme awesomeness
Merge branch 'refs/heads/dev_colorPicker'
Merge branch 'refs/heads/master' into dev_reskin