changing flash activity
commit
Merge branch 'colin4' into master2

Conflicts:
	Bonsai/src/org/bonsai/activities/FlashActivity.java
	Bonsai/src/org/bonsai/activities/FlashSectionFragment.java
conflicts resolved