[mir-bzr] Update
[unity-system-compositor-bzr] Add lightdm stuff
Merge branch 'master' into tracker-mir-bzr

Conflicts:
	mir-bzr/PKGBUILD