Last work
Merge commit '1e349ad4f0a24c5b56f05ed28e5e8c0d4a437d91' into Init

Conflicts:
	BarCodeReader/BCRViewController.m