Merge branch 'origin-paglias-fix-guilds' into develop

Conflicts:
	public/css/index.styl

src/controllers/groups.js

@@ -272,8 +272,13 @@ api.invite = function(req, res, next) {
     }
 
     function sendInvite (){
-      //req.body.type in 'guild', 'party'
-      invite.invitations.party = {id:group._id, name: group.name}
+      if(group.type === 'guild'){
+        invite.invitations.guilds.push({id: group._id, name: group.name});
+      }else{
+        //req.body.type in 'guild', 'party'
+        invite.invitations.party = {id: group._id, name: group.name}
+      }
+
       invite.save();
       Group.findById(group._id)
         .populate('members', partyFields).exec(function(err, saved){

src/models/user.js

@@ -87,7 +87,7 @@ var UserSchema = new Schema({
   /* FIXME remove?*/
 
   invitations: {
-    guilds: Array,
+    guilds: {type: Array, 'default': []},
     party: Schema.Types.Mixed
   },
   items: {