refector FormularEditor
fix lint warning in ExternInternRepresentationMapping
replace hard coded String
Merge pull request #756 from Catrobat/issue#695

fix issue#695: Refactor FormulaEditor ExternInternRepresentationMapping
Refactor ProjectUpAndDownloadTest

* update okhttp lib to 1.2.1
* reintegrate testRenameProjectNameAndDescriptionWhenUploading
* reintegrate testDownload
* reintegrate testUploadModifiedStandardProject
* remove unnecessary intents
* refactor private methods
Merge pull request #760 from Catrobat/FixProjectUpAndDownloadTest

Refactor ProjectUpAndDownloadTest
Refactor IfBrickTest

* Change step width
* Change log tag
Merge pull request #763 from Catrobat/FixProjectUpAndDownloadTest

Refactor IfBrickTest
Merge branch 'master' into LiveWallpaper_Master