Merge branch 'develop' into TheHollidayInn-challenges-clone

Take specHelper off of global scope

test/spec/controllers/challengesCtrlSpec.js

@@ -188,10 +188,10 @@ describe('Challenges Controller', function() {
     var challengeToClone = {
       name: 'copyChallenge',
       description: 'copyChallenge',
-      habits: [newHabit()],
-      dailys: [newDaily()],
-      todos: [newTodo()],
-      rewards: [newReward()],
+      habits: [specHelper.newHabit()],
+      dailys: [specHelper.newDaily()],
+      todos: [specHelper.newTodo()],
+      rewards: [specHelper.newReward()],
       leader: 'unique-user-id',
       group: { _id: "copyGroup" },
       timestamp: new Date("October 13, 2014 11:13:00"),