Add /tmp to gitignore
Merge branch 'master' into ui-code-cleanup

Conflicts:
	.gitignore