something
Merge branch 'NySprint2' into Lisbeth
r filer
string update
tilbage med designet i activity_setting.xml
	modified:   source/workspace/Launcher/gen/dk/aau/cs/giraf/gui/R.java
	modified:   source/workspace/OasisApp/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/PARROT/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/PARROT/gen/yuku/ambilwarna/R.java
	modified:   source/workspace/PictoAdmin/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/Wombat/gen/dk/aau/cs/giraf/oasis/lib/R.java
	modified:   source/workspace/Wombat/gen/dk/aau/cs/giraf/wombat/drawlib/R.java
	modified:   source/workspace/Wombat/gen/kankan/wheel/R.java
	modified:   source/workspace/Wombat/gen/yuku/ambilwarna/R.java
ny fil spinner activity
copys
To lisbeth
Merge remote-tracking branch 'origin/Klim' into Lisbeth
så virker setting men skal sættes sammen med det andet
så burde Settings virk når dataloader og andre bliver tilpasset
Merge remote-tracking branch 'origin/NySprint2' into Lisbeth

Conflicts:
	source/workspace/PARROT/gen/dk/aau/cs/giraf/parrot/R.java
	source/workspace/PARROT/gen/yuku/ambilwarna/R.java
	source/workspace/PARROT/res/layout/activity_setting.xml
	source/workspace/PARROT/res/values/strings.xml

	modified:   source/workspace/PARROT/res/layout/activity_setting.xml
	deleted:    source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/SpinnerActivity.java