nexus7 adaptions
Merge branch 'master' into nexus7
xml cleanup, remove lint errors/warnings
quickfix tests
removed condensed strings, fixed tests
Merge branch 'master' into nexus7
removed unnecessary styles
change tests
fixed tests
Merge pull request #145 from Catrobat/nexus7

Nexus7
Merge branch 'master' into refactor_variables