update version info for release 1.10.0.1 (online)
Merge branch 'master' into Feature-CustomShapes
make category combobox appear; make label 'category' appear for macbook air 11'
Merge commit '5ef29df3a8f9f4efb07af4006b9e07a87630bfdd' into release
update version info for dev 1.10.0.2 online
update version info for release 1.10.0.2 online
update tutorial file
update version info for release 1.10.0.2 offline
Merge branch 'release'