[BL] add xcodeproj file to gitignore, change some words on views
Merge branch 'master' of https://github.com/topping/RideIM

Conflicts:
	.gitignore
	RideIM.xcodeproj/project.pbxproj
[BL] add xcodeproj and tilde files to gitignore