[0.2.W, 01][Refactor] Search uses only one database query now (Tischler)
Merge branch 'Claudio'

Conflicts:
	MobileWiki/src/com/mobilewiki/SQLHandler.java
	MobileWiki/src/com/mobilewiki/SearchHandler.java
[][Refactoring] <IP-Adresse für Webservice eingetragen> (CK, LH)
[0.2.W] Implement search in web service (Tischler)
[07, 0.4.W] <Erstellen von Insert, Update und Delete auf alle Tabllen
im Webservice.> (CK, LH)
Merge remote-tracking branch 'origin/Jakob'

Conflicts:
	MobileWiki/src/com/mobilewiki/RequestHandler.java
	MobileWiki/src/com/mobilewiki/SearchHandler.java
	MobileWiki/src/com/mobilewiki/controls/WebserviceAdapter.java
Merge branch 'Claudio'

Conflicts:
	WebserviceMobileWiki/src/com/mobilewiki/webservice/MobileWiki.java
[07, 0.4.W][Refactoring] <Mapping von RequestServer und Webservice am
Server>
(CK)
Merge branch 'master' into stefan2

Conflicts:
	MobileWiki/src/com/mobilewiki/RequestHandler.java
	MobileWiki/src/com/mobilewiki/SearchHandler.java
	WebserviceMobileWiki/src/com/mobilewiki/rest/MobileWikiServer.java
	WebserviceMobileWiki/src/com/mobilewiki/webservice/MobileWiki.java
[0.2.W] Re-Implement search in web service (Tischler)
[0.4.W, 06] < Syntax Highlighting WORKS!!!!!!11 > (Sehic, Prott)
Merge branch 'irfan'
Merge remote-tracking branch 'origin/stefan2'
[0.2.W] add sql search to RequestHandler (Tischler)
[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)
[] <Erstellen eines JUnit Tests für den Request Handler> (CK, JM)
Merge branch 'master' of https://github.com/JakobMangelberger/MobileWikiAndroid.git
Merge branch 'Claudio'