entryactivity, expecting conflicts
Merge branch 'master' of https://github.com/RonnieVandenPoel/SourceFish