Merge branch 'release/1.0.2' into develop
believed to be a working port to ColourLovers (losing some features and the color selection is worse)
order popular first
Merge branch 'feature/colourlovers' into develop
Merge branch 'release/2.0'