Merge pull request #248 from pencil2d/dev

Qt5.2 ready
Merge branch 'master' into dev