Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

 src/main/java/com/gitblit/wicket/pages/UserPage.java

@@ -172,9 +172,11 @@
      Form<Void> prefs = new Form<Void>("prefsForm");



      List<Language> languages = Arrays.asList(

            new Language("Deutsch","de"),

            new Language("English","en"),

            new Language("Español", "es"),

            new Language("Français", "fr"),

            new Language("Italiano", "it"),

            new Language("日本語", "ja"),

            new Language("한국말", "ko"),

            new Language("Nederlands", "nl"),