Merge remote-tracking branch 'origin/jeremy' into tom
added project file
initial DB add working for user places
Merge remote-tracking branch 'origin/master' into tom

Conflicts:
	Rendezvous/PlacesViewController.m
Merge remote-tracking branch 'origin/jeremy' into tom

Conflicts:
	Rendezvous/PlacesViewController.m
Merge remote-tracking branch 'origin/tom'