delete
Merge branch 'master' of https://github.com/chinhnguyenmag/QRCodeScan

Conflicts:
	Code/QRCodeScan/AndroidManifest.xml
	Code/QRCodeScan/bin/AndroidManifest.xml
	Code/QRCodeScan/bin/R.txt
	Code/QRCodeScan/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	Code/QRCodeScan/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
	Code/QRCodeScan/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	Code/QRCodeScan/project.properties
	Code/QRCodeScan/res/layout-sw600dp/activity_settings.xml
	Code/QRCodeScan/res/layout-sw720dp/activity_settings.xml
	Code/QRCodeScan/res/layout/activity_settings.xml