prior to pull
Merge branch 'master' of https://github.com/jpsember/RBuddy

Conflicts:
	RBuddy/src/com/js/rbuddy/ReceiptFilter.java