Merge pull request #1 from gottcode/master

sync upstream
Switch users use now dm-tool from lightdm
Merge pull request #4 from vejobuj/master

sync branch