testchanges to linear layout, before arrow

Changed to relative layout
Merge branch 'master' into adaptLookFragment
Merge remote-tracking branch 'origin/adaptLookFragment' into
PresentationVersion

Conflicts:
	catroid/res/values/colors.xml