Revert "update2"

This reverts commit 4d16172ab14b3a96c6c2ef90212e70501e5facad.
Revert a3f1450..d4db28d

This rolls back to commit a3f14506c6adb461e31f54d97db7fae67b4de732.
Revert "Revert "update2""

Conflicts:
	BBCamera/BBCamera.xcodeproj/project.pbxproj
	BBCamera/BBCamera/Classes/BBNavigationController.m