Merge branch 'LuneFox-develop' into develop

common/locales/en/groups.json

@@ -12,6 +12,7 @@
     "community": "Community Forum",
     "dataTool": "Data Display Tool",
     "resources": "Resources",
+    "askQuestionNewbiesGuild": "Ask a Question (Newbies Guild)",
     "tavernTalk": "Tavern Talk",
     "tavernAlert1": "Note: if you're reporting a bug, the developers won't see it here. Please",
     "tavernAlert2": "use GitHub instead",

website/views/options/social/tavern.jade

@@ -56,6 +56,9 @@
             tr
               td
                 a(target='_blank', href='http://habitica.wikia.com/wiki/Special:Forum')=env.t('community')
+            tr
+              td
+                a(target='_blank', href='https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a')=env.t('askQuestionNewbiesGuild')
 
       // Player Tiers
       .panel.panel-default(popover=env.t('tierPop'), popover-trigger="mouseenter", popover-placement="right")