[0.2.W, 01-02]<Activity-Navigation, ListView>(PP, SP)
[0.4.W, 07] <Erstellen von JUnit Tests zur DatenbankConnection.> (CK,
DP)
Merge remote-tracking branch 'origin/stefan'
Merge branch 'master' of https://github.com/JakobMangelberger/MobileWikiAndroid.git
Merge branch 'master' of https://github.com/JakobMangelberger/MobileWikiAndroid.git
[] < Pushing nu AndroidManifest > (JM)
[] deleted bin and gen folder for cleanup
[] deleted bin from wikitest and set up .gitignore for both projects (JM)
[][Refactor] Nur mehr einen Button im Android Home anzeigen (CK, DP)
[0.4.W, 01][Refactor] Moved color setting to xml (Tischler, Holzegger)
[0.2.W, 01] SearchActivity gets results from SearchHandler (Tischler, Holzegger)
[0.2.W, 01][Refactor] Move example entries to SQLHandler (Tischler, Holzegger)
[0.4.W, 07][Refactor] Change structure of WikiArticle (Tischler, Holzegger)
[][Refactor] Moved StableArrayAdapter to own class, added test cases for
SearchActivity (SP, PO)
[][Refactor] Removed Warnings (SP, PO)
[0.4.W, 07][Refactor] Change structure of WikiContent (Tischler, Holzegger)
[test2, test3] Added tests for SearchActivity (SP, PO)
[0.2.W, 01] Implemented search (Tischler, Holzegger)
[0.2.W, 01][Refactor] adapt search for search button in SearchActivity (Tischler, Holzegger)
Merge remote-tracking branch 'origin/master'

Conflicts:
	MobileWiki/src/com/mobilewiki/SearchActivity.java