Merge branch 'develop' into sabrecat/party-page

website/views/options/social/challenges.jade

@@ -144,7 +144,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
                   ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required
                   ng-disabled='insufficientGemsForTavernChallenge()')
                 | 
-                a.hint.vertical-20(target='_blank', href='http://habitrpg.wikia.com/wiki/Tags',
+                a.hint.vertical-20(target='_blank', href='http://habitica.wikia.com/wiki/Tags',
                   popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right')
                   =env.t('moreInfo')
 

website/views/shared/profiles/achievements.jade

@@ -29,7 +29,7 @@ div(ng-if='::profile.contributor.level || user._id == profile._id')
     small
       =env.t('contribText')
       | 
-      +aLink('http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', env.t('readMore'))
+      +aLink('http://habitica.wikia.com/wiki/Contributing_to_Habitica', env.t('readMore'))
       | .
   hr