Fixed .gitignore file lines and location.
Merge branch 'master' into damien

Conflicts:
	OriginalOrigins.git/branches/Assets/Art/Thumbs.db.meta
	OriginalOrigins.git/branches/Assets/Art/Title Screen/Thumbs.db.meta
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset