new files 2
Merge remote-tracking branch 'origin'

Conflicts:
	iLife/ImageMapViewController.h
	iLife/LifeTechnologiesMapViewController.h