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

common/script/public/userServices.js

@@ -251,7 +251,8 @@ angular.module('habitrpg')
               $window.location.href='/';
             });
           } else {
-            if ($window.location.pathname.indexOf('/static') !== 0){
+            var isStaticOrSocial = $window.location.pathname.match(/^\/(static|social)/);
+            if (!isStaticOrSocial){
               localStorage.clear();
               $window.location.href = '/logout';
             }