opening project by notification after downloading
fixes #249
Merge branch 'master' into issue#249

Conflicts:
	catroid/src/org/catrobat/catroid/web/ConnectionWrapper.java
Merge branch 'master' into issue#249
Merge branch 'master' into issue#249

Conflicts:
	catroid/src/org/catrobat/catroid/ui/MainMenuActivity.java
	catroid/src/org/catrobat/catroid/ui/dialogs/OverwriteRenameDialog.java
	catroid/src/org/catrobat/catroid/utils/StatusBarNotificationManager.java
	catroidUiTest/src/org/catrobat/catroid/uitest/web/ProjectUpAndDownloadTest.java
messing around with notifications
messing around #2
refactoring :)
implemented webview instead of browser intent

this reverts #485, fixes #451
some minor refactoring regarding urls done too
Merge branch 'master' into issue#249

Conflicts:
	catroid/src/org/catrobat/catroid/transfers/ProjectDownloadService.java
	catroid/src/org/catrobat/catroid/ui/MainMenuActivity.java
	catroid/src/org/catrobat/catroid/utils/StatusBarNotificationManager.java
	catroid/src/org/catrobat/catroid/web/ServerCalls.java
	catroidUiTest/src/org/catrobat/catroid/uitest/web/ProjectUpAndDownloadTest.java
Fix incorrect text in Dialogue for "When..." bricks.

changed "Delete Brick" to "Delete Script" in the context menu and "Delete this brick?" to "Delete this script?" in the ensuing dialog for "When..." bricks.

- added strings for dialogue in strings.xml

- added the setting of the strings in the BrickAdapter (onClickListener)

- refactored Tests for "When..." bricks
Merge pull request #577 from Catrobat/webViewImplentation

implemented webview ready for merge
Merge pull request #578 from Catrobat/issue#463_2

Fix incorrect text in Dialogue for "When..." bricks.
fix WebViewActivityTest

also autoformatted catroid/AndroidManifest.xml
done
Merge pull request #580 from Catrobat/addAndrToVersion

Add Andr. to version in AboutDialog
added check for Andr. prefix at version in AboutDialogTest
Merge pull request #579 from Catrobat/fixWebViewTests

fix WebViewActivityTest
Merge pull request #582 from Catrobat/addAboutDialogTestCheckAndrPrefix

added check for Andr. prefix at version in AboutDialogTest
Add Test for uploadProject without email
Fix uploadProject for devices without google account
Fix upload of large projects

* Updated http-request to 5.4.1 (necessary for ConnectionFactory)
* Added okhttp 1.1.1
* The fix itself is twofold:
  First, I enabled chunked uploading (Tranfser-Encoding: chunked).
  This didn't quite work with a 85MB project, I debugged as well as I
  could, then tested through a proxy on my dev machine to see the
  request headers. As soon as I used a proxy, it worked. So the error
  was gone once I tried to take a closer look.
  I did not bother trying tcpdump or similar on the phone itself.

  Secondly, I tried using OkHttp instead of the normal HttpClient with
  http-request, this worked out of the box, even without the proxy. I
  then tried to upload the same 85MB project on the production server
  which did not work (it aborted after 60 seconds).
  Turns out, SPDY is enabled on the production server and OkHttp tries
  to use the best available protocol (SPDY). Forcing HTTP 1.1 makes it
  work.

Advantages of using OkHttp: It's (supposedly) the best HttpClient
around, even got accepted back into AOSP.
https://android.googlesource.com/platform/external/okhttp/
Also it provides a consistent implementation on all versions of Android
where our app is installed. OkHttp supports Android 2.2 and above.

tl;dr: I have no idea what is actually fixing this issue. :D