Sabe Jones 83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 ...

Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png

2015-11-11 18:36:25 -05:00

..

achievements

feat(sharing): Streak Achievement

2015-11-06 16:54:23 -05:00

backgrounds

feat(content): November backgrounds and Armoire

2015-11-02 17:28:20 -05:00

customize

feat(events): Limited edition

2015-06-25 11:19:01 -05:00

gear

feat(content): November backgrounds and Armoire

2015-11-02 17:28:20 -05:00

misc

feat(modals): Hatch Pet modal

2015-10-15 16:34:53 -04:00

npcs

chore(event): End Fall Festival

2015-11-02 12:55:48 -05:00

quests

chore(news): Pet quest Bailey

2015-11-11 18:31:22 -05:00

shop

Resize sea foam image

2015-07-15 07:53:12 -05:00

stable

feat(pets): November quest

2015-11-11 17:23:16 -05:00