Added camera features.
Merge branch 'master' into thomas

Conflicts:
	Recommend.xcodeproj/project.pbxproj
Camera fixes.
Merge branch 'master' into thomas
Camera imrovements.
Camera imrovements.
Added missing view controller.