added new main menu option, small refactorings and javadoc
Merge branch 'master' of git@github.com:PaulNoth/wikipedia.git