Fixed some bugs with qr scanner
Merge branch 'feature-20140811-project-reorganization' into 20140401-dev-stable