Sabe Jones 41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png

2015-09-08 13:25:10 -05:00

..

faq.js

Adjust numbering of faq.js

2015-09-06 19:44:37 -05:00

index.coffee

Merge branch 'develop' into sabrecat/pet-201509

2015-09-08 13:25:10 -05:00

translation.js

Convert translation function to js

2015-09-06 16:20:14 -05:00