fix
fix 2
updated palette template
Merge branch 'templates' into dev
Merge branch 'canvas' into dev
d
fix conflict
added thief library
fixed upload bug
setup palettes
jqueryui library
tooltip added
Merge branch 'tooltip' into dev
added tooltip dominantColor
Merge branch 'tooltip' into dev
Merge branch 'dev' into colors
rounded corners and others
Merge branch 'colors' into dev
fixed canvas size