[0.4.W, 07][Refactor] Change structure of WikiArticle (Tischler, Holzegger)
[0.4.W, 07][Refactor] Change structure of WikiContent (Tischler, Holzegger)
[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