New gitignore
Merge branch 'PreferencesDialog'

Conflicts:
	.gitignore