file type association required for creating a new .gitkeep file (and any file without an existing association)
Merge branch 'master' of https://github.com/halilim/my-phpstorm5-settings

Conflicts:
	options/filetypes.xml