Got it compile after re-adding files one at a time in the resources, and after updating android dev stuff. Now running with OverviewActivity as main activity, and insert button launches adding a new event, but database query crashes then. So this commit is a broken one.
Just added a log message to TaskAward.java
Merge branch 'v0.3'

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/dollarsign.png
	res/drawable-ldpi/dollarsign.png
	res/drawable-mdpi/dollarsign.png
	res/drawable-xhdpi/dollarsign.png
	res/menu/activity_task_award.xml
	res/values/strings.xml
	src/net/famcash/OverviewActivity.java
	src/net/famcash/TaskAward.java
	src/net/famcash/contentprovider/FamCashContentProvider.java
	src/net/famcash/database/EventTable.java
Fixed all of those conflicts