Enabled The Camera and Photo Library
Merge branch 'Philipe'

Conflicts:
	Instagram/Base.lproj/Main.storyboard
Merge branch 'master' of https://github.com/thomasorten/Instagram