fixed edit button
fixed edit button from list view
fixed edit button from list view
merged conflicts (receipts)
merged conflicts (receipts)
override local changes
fixing merge conflict
Merge branch 'master' into merging

Conflicts:
	ExpensesApp/bin/ExpensesApp-common.wlapp