[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
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)
Merge remote-tracking branch 'origin/irfan'
Merge remote-tracking branch 'origin/master' into irfan

Conflicts:
	MobileWiki/res/menu/main.xml
	MobileWiki/src/com/mobilewiki/MainActivity.java
Merge branch 'Claudio'
[][Refactor] <Einbau des RequestHandler für die Erstellung von
JSONObjekten, Einbau des WebserviceAdapter für die Webservice
Anfragen, Refactor des RequestHandler, Löschen eines veralteten Tests
für die DBConnection> (CK, JM)