Merge branch 'develop' into sabrecat/analytics-service

.gitignore

@@ -15,6 +15,7 @@ newrelic_agent.log
 .bower-registry
 .bower-cache
 .vagrant
+Vagrantfile
 
 *.log
 src/*/*.map

Vagrantfile.example

@@ -6,6 +6,8 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider "virtualbox" do |v|
+    v.memory = 768
+    v.cpus = 1
     v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"]
   end
   config.vm.box = "thepeopleseason/habitrpg"

test/spec/mocks/sandbox.js

@@ -0,0 +1,9 @@
+var sandbox;
+
+beforeEach(function() {
+  sandbox = sinon.sandbox.create();
+});
+
+afterEach(function() {
+  sandbox.restore();
+});

test/spec/specHelper.js

@@ -1,15 +1,5 @@
 beforeEach(module('habitrpg'));
 
-var sandbox;
-
-beforeEach(function() {
-  sandbox = sinon.sandbox.create();
-});
-
-afterEach(function() {
-  sandbox.restore();
-});
-
 specHelper = {
   newUser: function(){
     var buffs = {per:0, int:0, con:0, str:0, stealth: 0, streaks: false};

website/views/static/front.jade

@@ -70,8 +70,8 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
                   a(href='/static/contact')=env.t('contactUs')
                 li
                   button#header-play-button.btn.btn-primary.navbar-btn.navbar-right(ng-click='playButtonClick()')= env.t('playButtonFull')
-      #intro
-        h1(ng-cloak) {{ variant==0 ? "#{env.t('motivate')}" : (variant==1 ? "#{env.t('motivate1')}" : "#{env.t('motivate2')}") }}
+      #intro(ng-cloak)
+        h1 {{ variant==0 ? "#{env.t('motivate')}" : (variant==1 ? "#{env.t('motivate1')}" : "#{env.t('motivate2')}") }}
         img.center-block.img-responsive(src='https://s3.amazonaws.com/habitrpg-assets/front/images/intro.png')
         // insert intro images
         .introcall.bg-success