belangrijke push, entry shit
strings
Merge branch 'master' of https://github.com/RonnieVandenPoel/SourceFish

Conflicts:
	SourceDroid/projectmanagement/res/values/strings.xml