0829 project.properties
Merge branch 'master' ot f https://github.com/ylc1218/Qrapp2

Conflicts:
	project.properties