Fix bug: duplicate buttons in word editor
Simplify locale handling
Some more changes for localization
Improve localization; undo some previous changes
Localization for AceWiki GUI classes; Echo-aware threads
Simpler retrieval of application instance
Merge remote-tracking branch 'origin/master' into gfservice

Conflicts:
	src/ch/uzh/ifi/attempto/acewiki/Wiki.java
	src/ch/uzh/ifi/attempto/acewiki/gui/ArticlePage.java
	src/ch/uzh/ifi/attempto/acewiki/gui/CommentComponent.java
	src/ch/uzh/ifi/attempto/acewiki/gui/SentenceComponent.java
	src/ch/uzh/ifi/attempto/echocomp/MessageWindow.java