Added layout to handle categories
update
merge conflict
strings
Merge branch 'NySprint2'
r filer
update projekt prop
Arbejdet på noget funktionalitet i pictoadmin
Merge remote-tracking branch 'origin/Sprint3' into Klim

Conflicts:
	source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PictoAdminMain.java