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

common/script/content/faq.js

@@ -0,0 +1,27 @@
+'use strict';
+
+require('coffee-script');
+var t = require('./translation.js');
+
+var NUMBER_OF_QUESTIONS = 12;
+
+var faq = {};
+
+faq.questions = [];
+
+for (var i = 0; i < NUMBER_OF_QUESTIONS; i++) {
+  var question = {
+    question: t('faqQuestion' + i),
+    ios: t('iosFaqAnswer' + i),
+    web: t('webFaqAnswer' + i)
+  };
+
+  faq.questions.push(question);
+}
+
+faq.stillNeedHelp = {
+  ios: t('iosFaqStillNeedHelp'),
+  web: t('webFaqStillNeedHelp')
+};
+
+module.exports = faq;

common/script/content/translation.js

@@ -0,0 +1,21 @@
+'use strict';
+
+require('coffee-script');
+var i18n = require('../i18n.coffee');
+
+var t = function(string, vars) {
+  var func = function(lang) {
+    if (vars == null) {
+      vars = {
+        a: 'a'
+      };
+    }
+    return i18n.t(string, vars, lang);
+  };
+
+  func.i18nLangFunc = true; // Trick to recognize this type of function
+
+  return func;
+};
+
+module.exports = t;