another checkin
Merge branch 'master' of github.com:mkuhlke/fbMobileDevHackathon

Conflicts:
	FBMobileDevDay/FBMobileDevDay.xcodeproj/project.pbxproj