Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

Conflicts:
	common/public/habitrpg-shared.js
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	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

common/public/habitrpg-shared.js

@@ -16855,5 +16855,10 @@ process.chdir = function (dir) {
     }
 }).call(this);
 
+<<<<<<< HEAD:common/public/habitrpg-shared.js
 }).call(this,typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{}]},{},[1])
+},{}]},{},[1])
+=======
+}).call(this,require("/Users/blade/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
+},{"./content.coffee":5,"./i18n.coffee":6,"/Users/blade/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
+>>>>>>> ae36fc68906dfa9c9724e5f00a23935681a2f63f:dist/habitrpg-shared.js