Merge pull request #222 from chchwy/master

Fix compile warning: .ui redefinition in .pro
Merge branch 'master' of https://github.com/pencil2d/pencil
Minor, rename variables