Merge remote-tracking branch 'origin/master' into Klim
Removed default hello world message
Add pictures. Redesign parrot.
Merge remote-tracking branch 'origin/Klim' into Jacob-2

Conflicts:
	Source/workspace/PARROT/gen/dk/aau/cs/giraf/parrot/R.java
	Source/workspace/PARROT/src/dk/aau/cs/giraf/parrot/PARROTActivity.java

	new file:   Source/workspace/PARROT/res/drawable-hdpi/action_settings.png
	new file:   Source/workspace/PARROT/res/drawable-hdpi/navigation_back.png
	new file:   Source/workspace/PARROT/res/drawable-ldpi/action_settings.png
	new file:   Source/workspace/PARROT/res/drawable-ldpi/navigation_back.png
	new file:   Source/workspace/PARROT/res/drawable-mdpi/action_settings.png
	new file:   Source/workspace/PARROT/res/drawable-mdpi/navigation_back.png