cenas loucas
Merge branch 'master' of https://github.com/luismfonseca/appy-bpi

Conflicts:
	qrcode_reader/SmartJukeBox/Bin/Debug/SmartJukeBox.dll
	qrcode_reader/SmartJukeBox/Bin/Debug/SmartJukeBox.pdb
	qrcode_reader/SmartJukeBox/Bin/Debug/SmartJukeBox_Debug_AnyCPU.xap
	qrcode_reader/SmartJukeBox/Menu.xaml
	qrcode_reader/SmartJukeBox/obj/Debug/SmartJukeBox.csproj.FileListAbsolute.txt
	qrcode_reader/SmartJukeBox/obj/Debug/SmartJukeBox.dll
	qrcode_reader/SmartJukeBox/obj/Debug/SmartJukeBox.g.resources
	qrcode_reader/SmartJukeBox/obj/Debug/SmartJukeBox.pdb
	qrcode_reader/SmartJukeBox/obj/Debug/XapCacheFile.xml