bugs fixed
conflict fixed
Merge branch 'dev' of https://github.com/yangsiy/Plask into dev