added *.pxm to .gitignore
merged .gitignore changes from desktop branch

Conflicts:
	.gitignore