[0.4.W, 06] < Syntax Highlighting WORKS!!!!!!11 > (Sehic, Prott)
Merge branch 'irfan'
Merge remote-tracking branch 'origin/stefan2'
[0.4.W, 06][Refactoring] < Syntax Highlighting WORKS!!!!!!11 > (Sehic,
Prott)
Merge branch 'irfan'

Conflicts:
	MobileWiki/src/com/mobilewiki/EditorActivity.java
[0.2.W] return search results HashMap<String, String> (Tischler)
Merge branch 'master' of https://github.com/JakobMangelberger/MobileWikiAndroid.git
Merge branch 'Claudio'
[0.2.W] return search results ArrayList<String> (Tischler)
[][Refactoring] <Unnötige Imports rausgegeben, neues Jar File> (CK)
[0.4.W, 06][Refactoring] < Syntax Highlighting WORKS!!!!!!11 > (Sehic,
Prott)
[0.2.W] return search results ArrayList<String> (Tischler)
Merge branch 'master' into stefan2

Conflicts:
	MobileWiki/src/com/mobilewiki/RequestHandler.java
Merge branch 'irfan'

Conflicts:
	MobileWiki/src/com/mobilewiki/ContentHTMLParser.java
	MobileWiki/src/com/mobilewiki/EditorActivity.java
	MobileWiki/src/com/mobilewiki/IHTMLConstants.java
[0.2.W] return search results String (Tischler)
[0.8W, 04] Added exit button (IS, SP)
Added some changes
[0.2.W] Fix search for database (Tischler, Holzegger)
Merge branch 'master' into stefan2
Merge remote-tracking branch 'origin/master'