Committing save branch to master
Ignore xcodeproj
Gitignore changes
Remove folder that shouldn't be tracked
Merge branch 'mapacentral'

Conflicts:
	Locartor/Locartor.xcodeproj/project.pbxproj
	Locartor/Locartor/TBIAppDelegate.m
Merge branch 'master' of https://github.com/thebitisland/ioslocartor

Conflicts:
	.gitignore