grid changed to list
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/happyshoper/FullReceiptInfoActivity.java
	app/src/main/res/layout/full_receipt_info.xml
grid changed to list