QR Code added
Merge branch 'master' of https://github.com/colmiscool/MM_Project

Conflicts:
	Report.pages/Index.zip
	Report.pages/Metadata/Properties.plist