master branch
Merge remote-tracking branch 'upstream/master'
master branch
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
changed string values in New Project Dialog
changed google APIs to android-17
changed german string values
Merge branch 'renameProjectToProgram' of https://github.com/vidak92/Catroid into renameProjectToProgram
reverted android target changes