onresume etc
Merge branch 'master' of https://github.com/RonnieVandenPoel/SourceFish

Conflicts:
	SourceDroid/projectmanagement/src/com/sourcefish/projectmanagement/EntryActivity.java