Merge branch 'master' of
https://github.com/JakobMangelberger/MobileWikiAndroid.git

Conflicts:
	MobileWiki/src/com/mobilewiki/EditorActivity.java
Merge branch 'master' of
https://github.com/JakobMangelberger/MobileWikiAndroid.git