Merged in changes from develop and re-ran grunt full

Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png

script/content.coffee

@@ -485,7 +485,7 @@ api.spells =
         bonus *= Math.ceil ((if target.value < 0 then 1 else target.value+1) *.075)
         #console.log {bonus, expBonus:bonus,upBonus:bonus*.1}
         user.stats.exp += diminishingReturns(bonus,75)
-        user.party.quest.progress.up += diminishingReturns(bonus*.1,50,30) if user.party.quest.key
+        user.party.quest.progress.up += diminishingReturns(bonus*.1,50,30)
 
     mpheal:
       text: t('spellWizardMPHealText')
@@ -528,7 +528,7 @@ api.spells =
       notes: t('spellWarriorSmashNotes')
       cast: (user, target) ->
         target.value += 2.5 * (user._statsComputed.str / (user._statsComputed.str + 50)) * user.fns.crit('con')
-        user.party.quest.progress.up += Math.ceil(user._statsComputed.str * .2) if user.party.quest.key
+        user.party.quest.progress.up += Math.ceil(user._statsComputed.str * .2)
     defensiveStance:
       text: t('spellWarriorDefensiveStanceText')
       mana: 25
@@ -786,12 +786,14 @@ api.specialPets =
   'BearCub-Polar':      'polarBearPup'
   'MantisShrimp-Base':  'mantisShrimp'
   'JackOLantern-Base':  'jackolantern'
+  'Mammoth-Base':       'mammoth'
 
 api.specialMounts =
   'BearCub-Polar':	'polarBear'
   'LionCub-Ethereal':	'etherealLion'
   'MantisShrimp-Base':	'mantisShrimp'
   'Turkey-Base': 'turkey'
+  'Mammoth-Base': 'mammoth'
 
 api.hatchingPotions =
   Base:             value: 2, text: t('hatchingPotionBase')
@@ -909,6 +911,45 @@ api.quests =
       gp: 0
       exp: 0
 
+  stressbeast:
+    text: t("questStressbeastText")
+    notes: t("questStressbeastNotes")
+    completion: t("questStressbeastCompletion")
+    completionChat: t("questStressbeastCompletionChat")
+    value: 0
+    canBuy: false
+    boss:
+      name: t("questStressbeastBoss")
+      hp: 2750000
+      str: 1
+      def: 1
+      rage:
+        title: t("questStressbeastBossRageTitle")
+        description: t("questStressbeastBossRageDescription")
+        value: 1450000
+
+        stables:t('questStressbeastBossRageStables')
+        bailey:t('questStressbeastBossRageBailey')
+        guide:t('questStressbeastBossRageGuide')
+    drop:
+      items: [
+        {type: 'pets', key: 'Mammoth-Base', text: t('questStressbeastDropMammothPet')}
+        {type: 'mounts', key: 'Mammoth-Base', text: t('questStressbeastDropMammothMount')}
+
+        {type: 'food', key: 'Meat', text: t('foodMeat')}
+        {type: 'food', key: 'Milk', text: t('foodMilk')}
+        {type: 'food', key: 'Potatoe', text: t('foodPotatoe')}
+        {type: 'food', key: 'Strawberry', text: t('foodStrawberry')}
+        {type: 'food', key: 'Chocolate', text: t('foodChocolate')}
+        {type: 'food', key: 'Fish', text: t('foodFish')}
+        {type: 'food', key: 'RottenMeat', text: t('foodRottenMeat')}
+        {type: 'food', key: 'CottonCandyPink', text: t('foodCottonCandyPink')}
+        {type: 'food', key: 'CottonCandyBlue', text: t('foodCottonCandyBlue')}
+        {type: 'food', key: 'Honey', text: t('foodHoney')}
+      ]
+      gp: 0
+      exp: 0
+
   evilsanta:
     canBuy:false
     text: t('questEvilSantaText') # title of the quest (eg, Deep into Vice's Layer)