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.9.W][Refactor] <Navigation> (SP, DP)
[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/master' into irfan

Conflicts:
	MobileWiki/res/menu/main.xml
	MobileWiki/src/com/mobilewiki/MainActivity.java