+ master ('change' fix)
+ master
+ dev
* fixed redraw
Merge branch 'dev' into gh-pages
* flash support