as
Merge branch 'master' of https://github.com/gallonp/GiambiAndroid

Conflicts:
	src/com/example/giambi/activity/TransactionActivity.java
	src/com/example/giambi/util/Util.java
ss