Arbejdet på funktionalitet i pictoadmin
Merge remote-tracking branch 'origin/Sprint3' into Klim

Conflicts:
	source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PictoAdminMain.java
Small changes
Merge remote-tracking branch 'origin/Sprint3' into Klim
Small changes to test sending Intent with Intent
Merge remote-tracking branch 'origin/Sprint3' into Klim
Hej fra Anders
hej fra anders
Small changes
Merge remote-tracking branch 'origin/Sprint3' into Klim
Changed layout for PictoAdminMain
Merge branch 'Lisbeth' into Sprint3