Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop

migrations/20131117_fix_task_types.js

@@ -0,0 +1,18 @@
+// TODO figure out why this is happening in the first place
+
+db.users.find({},{habits:1, dailys:1, todos:1, rewards:1}).forEach(function(user){
+  _.each(user.habits, function(task){
+    task.type = 'habit';
+  })
+  _.each(user.dailys, function(task){
+    task.type = 'daily';
+  })
+  _.each(user.todos, function(task){
+    task.type = 'todo';
+  })
+  _.each(user.rewards, function(task){
+    task.type = 'reward';
+  })
+
+  db.users.update({_id:user._id}, {$set:{habits: user.habits, dailys: user.dailys, todos: user.todos, rewards: user.rewards}});
+});

public/css/customizer.styl

@@ -22,7 +22,7 @@ menu
     line-height: 2
 
 .customize-option
-  border: 1px solid grey;
+  border: 0px solid grey;
   background-color: hsl(0, 0%, 93%);
   margin-bottom: 10px
   

views/options/social/tavern.jade

@@ -47,10 +47,12 @@
     // Player Tiers
     .modal(style='position: relative;top: auto;left: auto;right: auto;margin: 0 auto 20px;z-index: 1;max-width: 100%;')
       .modal-header
-        h3 Player Tier Legend
+        h3 Player Tiers
       .modal-body
         small.
-          Click labels to expand. See <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'>contribution details.</a>
+          Click tier labels below for more information. <br />
+          <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'>Learn more about contributor rewards</a> <br />
+          <a href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG' target='_blank'>Learn how to contribute to HabitRPG</a>
         table.table.table-striped
           tr
             td