test git
Merge branch 'master' of https://github.com/ranafde/Virtual-Receipt

Conflicts:
	VirtualReceipt/project.properties
Check git