PARROT reading done
Merge remote-tracking branch 'origin/master' into Jacob-2
Merge remote-tracking branch 'origin/Jacob-2' into Lisbeth
Merge remote-tracking branch 'origin/master' into Lisbeth
Helper er ændret med flere apps og data
Merge branch 'Lisbeth'
Merge remote-tracking branch 'origin/master' into Klim

Conflicts:
	Source/workspace/OasisApp/gen/.gitignore