changing flash activity
Added increment stats methods
forgot 1
fix the properties
fix imports
Merge remote-tracking branch 'origin/colin4' into master2

Conflicts:
	Bonsai/project.properties
	Bonsai/src/org/bonsai/activities/MultiChoiceActivity.java