fixing constraints with map
fixed merge 2nd try
another commit for fixing storyboard
Merge branch 'ian'

Conflicts:
	TakeMeNearThere/en.lproj/MainStoryboard.storyboard