(0.2 W) Fixed the test case <Sehic>
Merge branch 'master' of https://github.com/JakobMangelberger/MobileWikiAndroid.git
[0.6W, 4] < Added further editor functionality, added image to TextView
and EditText - further dev. needed > (Sehic)
[0.6W, 4] < Added further editor functionality, enabled image preview in
PreviewActivity > (Sehic)
Merge branch 'master' of
https://github.com/JakobMangelberger/MobileWikiAndroid.git

Conflicts:
	MobileWiki/src/com/mobilewiki/EditorActivity.java
[0.3W, 1] < Preparing content handler > (IS)
Fixed menu in preview activity
Merge branch 'master' of
https://github.com/JakobMangelberger/MobileWikiAndroid.git
Enabled scrolling in Preview Activity
Enabled scrolling in Preview Activity
Merge branch 'master' of
https://github.com/JakobMangelberger/MobileWikiAndroid.git
[07, 0.4.W] <Einführen der Rest Api> (CK, JM)
Merge branch 'master' of
https://github.com/JakobMangelberger/MobileWikiAndroid.git
Merge branch 'master' of
https://github.com/JakobMangelberger/MobileWikiAndroid.git
[test5, test6] Created tests for Preview (SP, DP)
[1.0.W] Added about box (SP, DP)
[0.3W, 3] < Changed properties of the start page > (Sehic, Oppeneiger)
[0.9.W][Refactor] <Navigation> (SP, DP)
EditorActivity: Parsing ignores newline characters
[1.0.W] <Added about box> (SP, DP) 
[test6] <Testcase for preview added> (SP, DP) 
[0.9.W][Refactor] <Navigation> (SP, DP)