modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/ListViewAdapter.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/ManageCategoryFragment.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/ManagementBoxDragListener.java
	renamed:    Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/Category.java -> Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTCategory.java
	renamed:    Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/CategoryAdapter.java -> Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTCategoryAdapter.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTDataLoader.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTProfile.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PictogramAdapter.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/SpeechBoardFragment.java
Merge remote-tracking branch 'origin/Jacob'
Dataloader Refactoring
Merge remote-tracking branch 'origin/Jacob-2' into lisbeth2

Conflicts:
	Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/SpeechBoardFragment.java

	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/ListViewAdapter.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/ManageCategoryFragment.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/ManagementBoxDragListener.java
	renamed:    Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/Category.java -> Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTCategory.java
	renamed:    Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/CategoryAdapter.java -> Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTCategoryAdapter.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTDataLoader.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTProfile.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PictogramAdapter.java
	modified:   Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/SpeechBoardFragment.java
	deleted:    Source/workspace/Wombat/gen/.gitignore
	new file:   Source/workspace/Wombat/gen/dk/aau/cs/giraf/TimerLib/R.java
nyt i speech board efter merge konflikt