changed colours
Merge branch 'master' into refactor_variable_list
layout of text fields
fixed missing translations for plural strings
merged with master
Merge branch 'master' into refactor_variable_list
Merge branch 'master' into refactor_variable_list

Conflicts:
	catroid/res/values/colors.xml
	catroid/res/values/styles.xml
Merge branch 'master' into refactor_variable_list

Conflicts:
	catroid/res/values/strings.xml
Renamed  visible occurances of "Sprite" + test
Merge branch 'master' into refactor_variable_list
added bottombar to variable list
Merge remote-tracking branch 'origin/master' into RenameVisibleOccurancesOfSpriteToObject
master branch
Merge remote-tracking branch 'upstream/master'
master branch
refactored variable list
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into refactor_variable_list