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

migrations/csvexport.py

@@ -1,10 +1,10 @@
 import csv
 
-data = csv.reader(open('/home/slappybag/backrs/800dollar.csv', 'rb'), delimiter=",", quotechar='|')
-column = []
+with open(r"/home/slappybag/Documents/SurveyScrape.csv") as f:
+     reader = csv.reader(f, delimiter=',', quotechar='"')
+     column = []
+     for row in reader:
+        if row:
+            column.append(row[4])
 
-for row in data:
-    column.append(row[9])
-
-print "one:"
 print column

views/app/groups.html

@@ -111,6 +111,7 @@
                             <input type='radio' name='new-group-privacy' checked="{equal('private',_new.group.privacy)}" > Invite Only
                         </label>
                         <input type="submit" class="btn {#unless and(_new.group.privacy,_new.group.name)}disabled{/}" value="Create" /><span class='gem-cost'>4 Gems</span>
+                        <p><small>The Gem cost promotes high quality guilds and is transferred into your guild's bank so you can use as rewards in the upcoming challenges feature!</small></p>
                     </div>
                 </div>
             {{else}}