dondi latest commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/project/firefly/ActivityProducts.java
	app/src/main/res/layout/expense_layout.xml
	app/src/main/res/layout/listrow_details.xml
	app/src/main/res/values/strings.xml
10 14 2014 9:16am