meera's code base
Merge branch 'master' of https://github.com/stevesloka/TDCiOS

Conflicts:
	.DS_Store
	Classes/AppDelegate.m
	Classes/MapViewController.m
	Classes/RegisterController.h
	Classes/RegisterController.m
	MapCallouts.xcodeproj/project.pbxproj
	MapCallouts.xcodeproj/project.xcworkspace/xcuserdata/codeapalooza.xcuserdatad/UserInterfaceState.xcuserstate
	en.lproj/MainWindow.xib
	en.lproj/MapViewController.xib