Test
	modified:   Source/workspace/DrawLib/.classpath
	modified:   Source/workspace/DrawLib/.project
	modified:   Source/workspace/GIRAF_Components/.project
	modified:   Source/workspace/GIRAF_Components/libs/android-support-v4.jar
	modified:   Source/workspace/Launcher/.classpath
	modified:   Source/workspace/Launcher/.project
	modified:   Source/workspace/LocalDB/.project
	modified:   Source/workspace/OasisApp/.project
	modified:   Source/workspace/TimerLib/.project
	modified:   Source/workspace/Wombat/.project
Hello
Merge remote-tracking branch 'origin/Jacob' into Sprint4

Conflicts:
	Source/workspace/Launcher/.classpath
	Source/workspace/Launcher/.project
	Source/workspace/LocalDB/.project
	Source/workspace/Wombat/.project

	new file:   Source/workspace/GIRAF_Components/.project
	new file:   Source/workspace/GIRAF_Components/libs/android-support-v4.jar
	new file:   Source/workspace/Launcher/.classpath
	new file:   Source/workspace/Launcher/.project
	new file:   Source/workspace/LocalDB/.project
	new file:   Source/workspace/OasisApp/.project
	new file:   Source/workspace/Wombat/.project
	new file:   Source/workspace/android/.project
	modified:   source/workspace/PictoAdmin/src/dk/aau/cs/giraf/pictoadmin/PictoAdminMain.java
Fixing Jacob Merge