添加二维码功能
Merge branch 'master' of https://github.com/simaben/AndroidTest

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	res/values/color.xml
	res/values/styles.xml