diff --git a/snf-astakos-app/astakos/im/management/commands/project-list.py b/snf-astakos-app/astakos/im/management/commands/project-list.py
index f7790ac4af46ab1b2ebb25f306ff956ed962adeb..60a167ec060236e1589172777c1c090277712c6d 100644
--- a/snf-astakos-app/astakos/im/management/commands/project-list.py
+++ b/snf-astakos-app/astakos/im/management/commands/project-list.py
@@ -55,7 +55,7 @@ class Command(NoArgsCommand):
         labels = (
             'Application', 'Precursor', 'Status', 'Name', 'Project', 'Status'
         )
-        columns = (11, 10, 10, 30, 10, 10)
+        columns = (11, 10, 14, 30, 10, 10)
 
         if not options['csv']:
             line = ' '.join(l.rjust(w) for l, w in zip(labels, columns))
@@ -85,7 +85,7 @@ class Command(NoArgsCommand):
             fields = (
                 str(app.id),
                 str(prec_id),
-                app.state,
+                app.state_display(),
                 app.name,
                 str(project_id),
                 status
diff --git a/snf-astakos-app/astakos/im/migrations/0056_auto__chg_field_pendingthirdpartyuser_first_name__chg_field_pendingthi.py b/snf-astakos-app/astakos/im/migrations/0015_auto__add_chain__add_project__add_projectmembership__add_unique_projec.py
similarity index 53%
rename from snf-astakos-app/astakos/im/migrations/0056_auto__chg_field_pendingthirdpartyuser_first_name__chg_field_pendingthi.py
rename to snf-astakos-app/astakos/im/migrations/0015_auto__add_chain__add_project__add_projectmembership__add_unique_projec.py
index da963bd2cf742a8613ffd93c46fc9692ea85d641..431f7d803f25e2288e8b1b9a30463c23b0207144 100644
--- a/snf-astakos-app/astakos/im/migrations/0056_auto__chg_field_pendingthirdpartyuser_first_name__chg_field_pendingthi.py
+++ b/snf-astakos-app/astakos/im/migrations/0015_auto__add_chain__add_project__add_projectmembership__add_unique_projec.py
@@ -8,26 +8,301 @@ class Migration(SchemaMigration):
 
     def forwards(self, orm):
         
-        # Changing field 'PendingThirdPartyUser.first_name'
-        db.alter_column('im_pendingthirdpartyuser', 'first_name', self.gf('django.db.models.fields.CharField')(max_length=30, null=True))
+        # Removing unique constraint on 'AstakosUser', fields ['third_party_identifier', 'provider']
+        db.delete_unique('im_astakosuser', ['third_party_identifier', 'provider'])
 
-        # Changing field 'PendingThirdPartyUser.last_name'
-        db.alter_column('im_pendingthirdpartyuser', 'last_name', self.gf('django.db.models.fields.CharField')(max_length=30, null=True))
+        # Adding model 'Chain'
+        db.create_table('im_chain', (
+            ('chain', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        ))
+        db.send_create_signal('im', ['Chain'])
 
-        # Changing field 'PendingThirdPartyUser.affiliation'
-        db.alter_column('im_pendingthirdpartyuser', 'affiliation', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
+        # Adding model 'Project'
+        db.create_table('im_project', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('application', self.gf('django.db.models.fields.related.OneToOneField')(related_name='project', unique=True, to=orm['im.ProjectApplication'])),
+            ('last_approval_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('deactivation_reason', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
+            ('deactivation_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('creation_date', self.gf('django.db.models.fields.DateTimeField')()),
+            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=80, db_index=True)),
+            ('is_modified', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
+            ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True, db_index=True)),
+            ('state', self.gf('django.db.models.fields.IntegerField')(default=1, db_index=True)),
+        ))
+        db.send_create_signal('im', ['Project'])
+
+        # Adding model 'ProjectMembership'
+        db.create_table('im_projectmembership', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('person', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser'])),
+            ('request_date', self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2013, 1, 11, 12, 54, 30, 986304))),
+            ('project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Project'])),
+            ('state', self.gf('django.db.models.fields.IntegerField')(default=0, db_index=True)),
+            ('is_pending', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
+            ('is_active', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True)),
+            ('application', self.gf('django.db.models.fields.related.ForeignKey')(related_name='memberships', null=True, to=orm['im.ProjectApplication'])),
+            ('pending_application', self.gf('django.db.models.fields.related.ForeignKey')(related_name='pending_memebrships', null=True, to=orm['im.ProjectApplication'])),
+            ('pending_serial', self.gf('django.db.models.fields.BigIntegerField')(null=True, db_index=True)),
+            ('acceptance_date', self.gf('django.db.models.fields.DateField')(null=True, db_index=True)),
+            ('leave_request_date', self.gf('django.db.models.fields.DateField')(null=True)),
+        ))
+        db.send_create_signal('im', ['ProjectMembership'])
+
+        # Adding unique constraint on 'ProjectMembership', fields ['person', 'project']
+        db.create_unique('im_projectmembership', ['person_id', 'project_id'])
+
+        # Adding model 'ResourceMetadata'
+        db.create_table('im_resourcemetadata', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)),
+            ('value', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('im', ['ResourceMetadata'])
+
+        # Adding model 'AstakosUserAuthProvider'
+        db.create_table('im_astakosuserauthprovider', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('affiliation', self.gf('django.db.models.fields.CharField')(default=None, max_length=255, null=True, blank=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='auth_providers', to=orm['im.AstakosUser'])),
+            ('module', self.gf('django.db.models.fields.CharField')(default='local', max_length=255)),
+            ('identifier', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('active', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('auth_backend', self.gf('django.db.models.fields.CharField')(default='astakos', max_length=255)),
+            ('info_data', self.gf('django.db.models.fields.TextField')(default='', null=True, blank=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+        ))
+        db.send_create_signal('im', ['AstakosUserAuthProvider'])
+
+        # Adding unique constraint on 'AstakosUserAuthProvider', fields ['identifier', 'module', 'user']
+        db.create_unique('im_astakosuserauthprovider', ['identifier', 'module', 'user_id'])
+
+        # Adding model 'Serial'
+        db.create_table('im_serial', (
+            ('serial', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        ))
+        db.send_create_signal('im', ['Serial'])
+
+        # Adding model 'Resource'
+        db.create_table('im_resource', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('service', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Service'])),
+            ('desc', self.gf('django.db.models.fields.TextField')(null=True)),
+            ('unit', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
+            ('group', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)),
+        ))
+        db.send_create_signal('im', ['Resource'])
+
+        # Adding M2M table for field meta on 'Resource'
+        db.create_table('im_resource_meta', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('resource', models.ForeignKey(orm['im.resource'], null=False)),
+            ('resourcemetadata', models.ForeignKey(orm['im.resourcemetadata'], null=False))
+        ))
+        db.create_unique('im_resource_meta', ['resource_id', 'resourcemetadata_id'])
+
+        # Adding unique constraint on 'Resource', fields ['name', 'service']
+        db.create_unique('im_resource', ['name', 'service_id'])
+
+        # Adding model 'SessionCatalog'
+        db.create_table('im_sessioncatalog', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('session_key', self.gf('django.db.models.fields.CharField')(max_length=40)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='sessions', null=True, to=orm['im.AstakosUser'])),
+        ))
+        db.send_create_signal('im', ['SessionCatalog'])
+
+        # Adding model 'ProjectMembershipHistory'
+        db.create_table('im_projectmembershiphistory', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('person', self.gf('django.db.models.fields.BigIntegerField')()),
+            ('project', self.gf('django.db.models.fields.BigIntegerField')()),
+            ('date', self.gf('django.db.models.fields.DateField')(default=datetime.datetime.now)),
+            ('reason', self.gf('django.db.models.fields.IntegerField')()),
+            ('serial', self.gf('django.db.models.fields.BigIntegerField')()),
+        ))
+        db.send_create_signal('im', ['ProjectMembershipHistory'])
+
+        # Adding model 'AstakosUserQuota'
+        db.create_table('im_astakosuserquota', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('capacity', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
+            ('quantity', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
+            ('export_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
+            ('import_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
+            ('resource', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Resource'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser'])),
+        ))
+        db.send_create_signal('im', ['AstakosUserQuota'])
+
+        # Adding unique constraint on 'AstakosUserQuota', fields ['resource', 'user']
+        db.create_unique('im_astakosuserquota', ['resource_id', 'user_id'])
+
+        # Adding model 'ProjectResourceGrant'
+        db.create_table('im_projectresourcegrant', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('resource', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Resource'])),
+            ('project_application', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.ProjectApplication'], null=True)),
+            ('project_capacity', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=100000000000000000000000000000000L, max_digits=38, decimal_places=0)),
+            ('project_import_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=100000000000000000000000000000000L, max_digits=38, decimal_places=0)),
+            ('project_export_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=100000000000000000000000000000000L, max_digits=38, decimal_places=0)),
+            ('member_capacity', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=100000000000000000000000000000000L, max_digits=38, decimal_places=0)),
+            ('member_import_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=100000000000000000000000000000000L, max_digits=38, decimal_places=0)),
+            ('member_export_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=100000000000000000000000000000000L, max_digits=38, decimal_places=0)),
+        ))
+        db.send_create_signal('im', ['ProjectResourceGrant'])
+
+        # Adding unique constraint on 'ProjectResourceGrant', fields ['resource', 'project_application']
+        db.create_unique('im_projectresourcegrant', ['resource_id', 'project_application_id'])
+
+        # Adding model 'PendingThirdPartyUser'
+        db.create_table('im_pendingthirdpartyuser', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('third_party_identifier', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('provider', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
+            ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, null=True, blank=True)),
+            ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, null=True, blank=True)),
+            ('affiliation', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)),
+            ('token', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, blank=True)),
+            ('info', self.gf('django.db.models.fields.TextField')(default='', null=True, blank=True)),
+        ))
+        db.send_create_signal('im', ['PendingThirdPartyUser'])
+
+        # Adding unique constraint on 'PendingThirdPartyUser', fields ['provider', 'third_party_identifier']
+        db.create_unique('im_pendingthirdpartyuser', ['provider', 'third_party_identifier'])
+
+        # Adding model 'ProjectApplication'
+        db.create_table('im_projectapplication', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('applicant', self.gf('django.db.models.fields.related.ForeignKey')(related_name='projects_applied', to=orm['im.AstakosUser'])),
+            ('state', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(related_name='projects_owned', to=orm['im.AstakosUser'])),
+            ('chain', self.gf('django.db.models.fields.IntegerField')()),
+            ('precursor_application', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['im.ProjectApplication'], unique=True, null=True, blank=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=80)),
+            ('homepage', self.gf('django.db.models.fields.URLField')(max_length=255, null=True)),
+            ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('start_date', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
+            ('end_date', self.gf('django.db.models.fields.DateTimeField')()),
+            ('member_join_policy', self.gf('django.db.models.fields.IntegerField')()),
+            ('member_leave_policy', self.gf('django.db.models.fields.IntegerField')()),
+            ('limit_on_members_number', self.gf('django.db.models.fields.PositiveIntegerField')(null=True)),
+            ('comments', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
+            ('issue_date', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('im', ['ProjectApplication'])
+
+        # Adding unique constraint on 'ProjectApplication', fields ['chain', 'id']
+        db.create_unique('im_projectapplication', ['chain', 'id'])
+
+        # Adding field 'Service.order'
+        db.add_column('im_service', 'order', self.gf('django.db.models.fields.PositiveIntegerField')(default=0), keep_default=False)
+
+        # Adding index on 'Service', fields ['name']
+        db.create_index('im_service', ['name'])
+
+        # Adding field 'AstakosUser.uuid'
+        db.add_column('im_astakosuser', 'uuid', self.gf('django.db.models.fields.CharField')(max_length=255, unique=True, null=True), keep_default=False)
+
+        # Adding field 'AstakosUser.disturbed_quota'
+        db.add_column('im_astakosuser', 'disturbed_quota', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True), keep_default=False)
+
+        # Changing field 'AstakosUser.affiliation'
+        db.alter_column('im_astakosuser', 'affiliation', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
+
+        # Changing field 'AstakosUser.provider'
+        db.alter_column('im_astakosuser', 'provider', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
 
 
     def backwards(self, orm):
         
-        # Changing field 'PendingThirdPartyUser.first_name'
-        db.alter_column('im_pendingthirdpartyuser', 'first_name', self.gf('django.db.models.fields.CharField')(default='', max_length=30))
+        # Removing index on 'Service', fields ['name']
+        db.delete_index('im_service', ['name'])
+
+        # Removing unique constraint on 'ProjectApplication', fields ['chain', 'id']
+        db.delete_unique('im_projectapplication', ['chain', 'id'])
+
+        # Removing unique constraint on 'PendingThirdPartyUser', fields ['provider', 'third_party_identifier']
+        db.delete_unique('im_pendingthirdpartyuser', ['provider', 'third_party_identifier'])
+
+        # Removing unique constraint on 'ProjectResourceGrant', fields ['resource', 'project_application']
+        db.delete_unique('im_projectresourcegrant', ['resource_id', 'project_application_id'])
+
+        # Removing unique constraint on 'AstakosUserQuota', fields ['resource', 'user']
+        db.delete_unique('im_astakosuserquota', ['resource_id', 'user_id'])
+
+        # Removing unique constraint on 'Resource', fields ['name', 'service']
+        db.delete_unique('im_resource', ['name', 'service_id'])
+
+        # Removing unique constraint on 'AstakosUserAuthProvider', fields ['identifier', 'module', 'user']
+        db.delete_unique('im_astakosuserauthprovider', ['identifier', 'module', 'user_id'])
+
+        # Removing unique constraint on 'ProjectMembership', fields ['person', 'project']
+        db.delete_unique('im_projectmembership', ['person_id', 'project_id'])
+
+        # Deleting model 'Chain'
+        db.delete_table('im_chain')
+
+        # Deleting model 'Project'
+        db.delete_table('im_project')
+
+        # Deleting model 'ProjectMembership'
+        db.delete_table('im_projectmembership')
+
+        # Deleting model 'ResourceMetadata'
+        db.delete_table('im_resourcemetadata')
+
+        # Deleting model 'AstakosUserAuthProvider'
+        db.delete_table('im_astakosuserauthprovider')
+
+        # Deleting model 'Serial'
+        db.delete_table('im_serial')
+
+        # Deleting model 'Resource'
+        db.delete_table('im_resource')
+
+        # Removing M2M table for field meta on 'Resource'
+        db.delete_table('im_resource_meta')
+
+        # Deleting model 'SessionCatalog'
+        db.delete_table('im_sessioncatalog')
+
+        # Deleting model 'ProjectMembershipHistory'
+        db.delete_table('im_projectmembershiphistory')
+
+        # Deleting model 'AstakosUserQuota'
+        db.delete_table('im_astakosuserquota')
+
+        # Deleting model 'ProjectResourceGrant'
+        db.delete_table('im_projectresourcegrant')
+
+        # Deleting model 'PendingThirdPartyUser'
+        db.delete_table('im_pendingthirdpartyuser')
+
+        # Deleting model 'ProjectApplication'
+        db.delete_table('im_projectapplication')
+
+        # Deleting field 'Service.order'
+        db.delete_column('im_service', 'order')
+
+        # Deleting field 'AstakosUser.uuid'
+        db.delete_column('im_astakosuser', 'uuid')
+
+        # Deleting field 'AstakosUser.disturbed_quota'
+        db.delete_column('im_astakosuser', 'disturbed_quota')
+
+        # Changing field 'AstakosUser.affiliation'
+        db.alter_column('im_astakosuser', 'affiliation', self.gf('django.db.models.fields.CharField')(default='', max_length=255))
 
-        # Changing field 'PendingThirdPartyUser.last_name'
-        db.alter_column('im_pendingthirdpartyuser', 'last_name', self.gf('django.db.models.fields.CharField')(default='', max_length=30))
+        # Changing field 'AstakosUser.provider'
+        db.alter_column('im_astakosuser', 'provider', self.gf('django.db.models.fields.CharField')(default='', max_length=255))
 
-        # Changing field 'PendingThirdPartyUser.affiliation'
-        db.alter_column('im_pendingthirdpartyuser', 'affiliation', self.gf('django.db.models.fields.CharField')(default='', max_length=255))
+        # Adding unique constraint on 'AstakosUser', fields ['third_party_identifier', 'provider']
+        db.create_unique('im_astakosuser', ['third_party_identifier', 'provider'])
 
 
     models = {
@@ -75,7 +350,7 @@ class Migration(SchemaMigration):
         },
         'im.approvalterms': {
             'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 11, 10, 45, 47, 968841)', 'db_index': 'True'}),
+            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 11, 12, 54, 30, 982234)', 'db_index': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
         },
@@ -132,7 +407,7 @@ class Migration(SchemaMigration):
             'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 11, 10, 45, 47, 969658)'}),
+            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 11, 12, 54, 30, 983023)'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
         },
         'im.invitation': {
@@ -192,7 +467,7 @@ class Migration(SchemaMigration):
             'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
             'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
             'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '80'})
+            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
         },
         'im.projectmembership': {
             'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
@@ -206,14 +481,14 @@ class Migration(SchemaMigration):
             'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
             'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
             'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 11, 10, 45, 47, 973568)'}),
+            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 11, 12, 54, 30, 986304)'}),
             'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
         },
         'im.projectmembershiphistory': {
             'Meta': {'object_name': 'ProjectMembershipHistory'},
             'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'person': ('django.db.models.fields.BigIntegerField', [], {}),
             'project': ('django.db.models.fields.BigIntegerField', [], {}),
             'reason': ('django.db.models.fields.IntegerField', [], {}),
             'serial': ('django.db.models.fields.BigIntegerField', [], {})
diff --git a/snf-astakos-app/astakos/im/migrations/0015_auto__add_groupkind__add_astakosgroup__add_resourcemetadata__add_astak.py b/snf-astakos-app/astakos/im/migrations/0015_auto__add_groupkind__add_astakosgroup__add_resourcemetadata__add_astak.py
deleted file mode 100644
index 109ecbe3619403ad7d727f62d40adfd5553387b2..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0015_auto__add_groupkind__add_astakosgroup__add_resourcemetadata__add_astak.py
+++ /dev/null
@@ -1,302 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding model 'GroupKind'
-        db.create_table('im_groupkind', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)),
-        ))
-        db.send_create_signal('im', ['GroupKind'])
-
-        # Adding model 'AstakosGroup'
-        db.create_table('im_astakosgroup', (
-            ('group_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.Group'], unique=True, primary_key=True)),
-            ('kind', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.GroupKind'])),
-            ('desc', self.gf('django.db.models.fields.TextField')(null=True)),
-            ('creation_date', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2012, 12, 4, 9, 50, 9, 334623))),
-            ('issue_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
-            ('expiration_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
-            ('moderation_enabled', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('approval_date', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-            ('estimated_participants', self.gf('django.db.models.fields.PositiveIntegerField')(null=True)),
-        ))
-        db.send_create_signal('im', ['AstakosGroup'])
-
-        # Adding model 'ResourceMetadata'
-        db.create_table('im_resourcemetadata', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)),
-            ('value', self.gf('django.db.models.fields.CharField')(max_length=255)),
-        ))
-        db.send_create_signal('im', ['ResourceMetadata'])
-
-        # Adding model 'AstakosGroupQuota'
-        db.create_table('im_astakosgroupquota', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('limit', self.gf('django.db.models.fields.PositiveIntegerField')()),
-            ('resource', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Resource'])),
-            ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosGroup'], blank=True)),
-        ))
-        db.send_create_signal('im', ['AstakosGroupQuota'])
-
-        # Adding unique constraint on 'AstakosGroupQuota', fields ['resource', 'group']
-        db.create_unique('im_astakosgroupquota', ['resource_id', 'group_id'])
-
-        # Adding model 'Resource'
-        db.create_table('im_resource', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)),
-            ('service', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Service'])),
-        ))
-        db.send_create_signal('im', ['Resource'])
-
-        # Adding M2M table for field meta on 'Resource'
-        db.create_table('im_resource_meta', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('resource', models.ForeignKey(orm['im.resource'], null=False)),
-            ('resourcemetadata', models.ForeignKey(orm['im.resourcemetadata'], null=False))
-        ))
-        db.create_unique('im_resource_meta', ['resource_id', 'resourcemetadata_id'])
-
-        # Adding model 'Membership'
-        db.create_table('im_membership', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('person', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser'])),
-            ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosGroup'])),
-            ('date_requested', self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2012, 12, 4, 9, 50, 9, 338510))),
-            ('date_joined', self.gf('django.db.models.fields.DateField')(null=True, db_index=True)),
-        ))
-        db.send_create_signal('im', ['Membership'])
-
-        # Adding unique constraint on 'Membership', fields ['person', 'group']
-        db.create_unique('im_membership', ['person_id', 'group_id'])
-
-        # Adding model 'AstakosUserQuota'
-        db.create_table('im_astakosuserquota', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('limit', self.gf('django.db.models.fields.PositiveIntegerField')()),
-            ('resource', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Resource'])),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser'])),
-        ))
-        db.send_create_signal('im', ['AstakosUserQuota'])
-
-        # Adding unique constraint on 'AstakosUserQuota', fields ['resource', 'user']
-        db.create_unique('im_astakosuserquota', ['resource_id', 'user_id'])
-
-        # Adding index on 'Service', fields ['name']
-        db.create_index('im_service', ['name'])
-
-        # Adding M2M table for field owner on 'AstakosUser'
-        db.create_table('im_astakosuser_owner', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('astakosuser', models.ForeignKey(orm['im.astakosuser'], null=False)),
-            ('astakosgroup', models.ForeignKey(orm['im.astakosgroup'], null=False))
-        ))
-        db.create_unique('im_astakosuser_owner', ['astakosuser_id', 'astakosgroup_id'])
-
-
-    def backwards(self, orm):
-        
-        # Removing index on 'Service', fields ['name']
-        db.delete_index('im_service', ['name'])
-
-        # Removing unique constraint on 'AstakosUserQuota', fields ['resource', 'user']
-        db.delete_unique('im_astakosuserquota', ['resource_id', 'user_id'])
-
-        # Removing unique constraint on 'Membership', fields ['person', 'group']
-        db.delete_unique('im_membership', ['person_id', 'group_id'])
-
-        # Removing unique constraint on 'AstakosGroupQuota', fields ['resource', 'group']
-        db.delete_unique('im_astakosgroupquota', ['resource_id', 'group_id'])
-
-        # Deleting model 'GroupKind'
-        db.delete_table('im_groupkind')
-
-        # Deleting model 'AstakosGroup'
-        db.delete_table('im_astakosgroup')
-
-        # Deleting model 'ResourceMetadata'
-        db.delete_table('im_resourcemetadata')
-
-        # Deleting model 'AstakosGroupQuota'
-        db.delete_table('im_astakosgroupquota')
-
-        # Deleting model 'Resource'
-        db.delete_table('im_resource')
-
-        # Removing M2M table for field meta on 'Resource'
-        db.delete_table('im_resource_meta')
-
-        # Deleting model 'Membership'
-        db.delete_table('im_membership')
-
-        # Deleting model 'AstakosUserQuota'
-        db.delete_table('im_astakosuserquota')
-
-        # Removing M2M table for field owner on 'AstakosUser'
-        db.delete_table('im_astakosuser_owner')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 3, 11, 26, 47, 648667)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 3, 11, 26, 47, 642626)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 3, 11, 26, 47, 650373)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 8, 3, 11, 26, 47, 646518)'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0016_populate_group_data.py b/snf-astakos-app/astakos/im/migrations/0016_populate_group_data.py
deleted file mode 100644
index 53bbd248c77e9f83c6fb0d41eff16387eaa0bc04..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0016_populate_group_data.py
+++ /dev/null
@@ -1,236 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.v2 import DataMigration
-from django.db.models import Count
-
-
-class Migration(DataMigration):
-    def forwards(self, orm):
-
-        def _create_groupkind(name):
-            try:
-                orm.GroupKind(name=name).save()
-            except:
-                pass
-
-        t = ('default', 'course', 'project', 'laboratory', 'organization')
-        map(_create_groupkind, t)
-
-        default = orm.GroupKind.objects.get(name='default')
-
-        groups = {}
-
-        def _create_astakogroup(name):
-            try:
-                groups[name] = orm['im.AstakosGroup'].objects.get(name=name)
-            except orm.AstakosGroup.DoesNotExist:
-                try:
-                    g = orm['auth.Group'].objects.get(name=name)
-                    groups[
-                        name] = extended = orm.AstakosGroup(group_ptr_id=g.pk)
-                    extended.__dict__.update(g.__dict__)
-                    extended.kind = default
-                    extended.approval_date = datetime.datetime.now()
-                    extended.issue_date = datetime.datetime.now()
-                    extended.moderation_enabled = False
-                    extended.save()
-                    map(lambda u: orm.Membership(group=extended,
-                                                 person=orm.AstakosUser.objects.get(id=u.id),
-                                                 date_joined=datetime.datetime.now()
-                                                 ).save(),
-                        g.user_set.all())
-                except orm['auth.Group'].DoesNotExist:
-                    groups[name] = orm.AstakosGroup(name=name,
-                                                    kind=default,
-                                                    approval_date=datetime.datetime.now(),
-                                                    issue_date=datetime.datetime.now(),
-                                                    moderation_enabled=False
-                                                    )
-                    groups[name].save()
-
-        # catch integrate
-        t = ('default', 'shibboleth', 'helpdesk', 'faculty',
-             'ugrad', 'grad', 'researcher', 'associate')
-        map(_create_astakogroup, t)
-
-        orphans = orm.AstakosUser.objects.annotate(
-            num_groups=Count('astakos_groups')).filter(num_groups=0)
-        map(lambda u: orm.Membership(group=groups['default'],
-                                     person=u, date_joined=datetime.datetime.now()).save(), orphans)
-
-    def backwards(self, orm):
-        def _delete_groupkind(name):
-            try:
-                orm.GroupKind.objects.get(name=name).delete()
-            except orm.GroupKind.DoesNotExist:
-                pass
-
-        def _delete_astakosgroup(name):
-            try:
-                orm.AstakosGroup.objects.get(name=name).delete()
-            except orm.AstakosGroup.DoesNotExist:
-                pass
-
-        t = ('default', 'shibboleth', 'helpdesk', 'faculty',
-             'ugrad', 'grad', 'researcher', 'associate')
-        map(_delete_astakosgroup, t)
-
-        t = ('default', 'course', 'project', 'laboratory', 'organization')
-        map(_delete_groupkind, t)
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 8, 12, 40, 8, 181485)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 8, 12, 40, 8, 175548)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 8, 12, 40, 8, 183025)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 8, 8, 12, 40, 8, 179349)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0017_populate_resource_data.py b/snf-astakos-app/astakos/im/migrations/0017_populate_resource_data.py
deleted file mode 100644
index 1611ba0fdaa9d438bdfbd9773528a54622c89b4c..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0017_populate_resource_data.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# encoding: utf-8
-
-from south.v2 import DataMigration
-
-from astakos.im.settings import SERVICES
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-class Migration(DataMigration):
-    "Obsolete migration."
-        
-    def forwards(self, orm):
-        pass
-
-    def backwards(self, orm):
-        pass
-    
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 9, 11, 14, 9, 289091)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 9, 11, 14, 9, 283154)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 9, 11, 14, 9, 290713)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 8, 9, 11, 14, 9, 286925)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0018_auto__add_field_astakosgroup_homepage.py b/snf-astakos-app/astakos/im/migrations/0018_auto__add_field_astakosgroup_homepage.py
deleted file mode 100644
index 92ce2b7b983c6132c2404d871028f12a24024a58..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0018_auto__add_field_astakosgroup_homepage.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'AstakosGroup.homepage'
-        db.add_column('im_astakosgroup', 'homepage', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'AstakosGroup.homepage'
-        db.delete_column('im_astakosgroup', 'homepage')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 6, 16, 11, 52, 429294)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 6, 16, 11, 52, 423356)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 6, 16, 11, 52, 430810)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 9, 6, 16, 11, 52, 427324)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0020_auto__chg_field_astakosgroup_homepage.py b/snf-astakos-app/astakos/im/migrations/0020_auto__chg_field_astakosgroup_homepage.py
deleted file mode 100644
index 06eed7a11e4111902f0f3e2dec999181aeb761c7..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0020_auto__chg_field_astakosgroup_homepage.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Changing field 'AstakosGroup.homepage'
-        db.alter_column('im_astakosgroup', 'homepage', self.gf('django.db.models.fields.URLField')(max_length=255, null=True))
-
-
-    def backwards(self, orm):
-        
-        # Changing field 'AstakosGroup.homepage'
-        db.alter_column('im_astakosgroup', 'homepage', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 13, 70454)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 13, 64622)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 13, 72050)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 13, 68464)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0021_auto__add_field_astakosgroupquota_uplimit__add_field_astakosuserquota_.py b/snf-astakos-app/astakos/im/migrations/0021_auto__add_field_astakosgroupquota_uplimit__add_field_astakosuserquota_.py
deleted file mode 100644
index 99cfcf13b9465a6b88cf67d1fbe01ab085372845..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0021_auto__add_field_astakosgroupquota_uplimit__add_field_astakosuserquota_.py
+++ /dev/null
@@ -1,185 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'AstakosGroupQuota.uplimit'
-        db.add_column('im_astakosgroupquota', 'uplimit', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'AstakosUserQuota.uplimit'
-        db.add_column('im_astakosuserquota', 'uplimit', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'AstakosGroupQuota.uplimit'
-        db.delete_column('im_astakosgroupquota', 'uplimit')
-
-        # Deleting field 'AstakosUserQuota.uplimit'
-        db.delete_column('im_astakosuserquota', 'uplimit')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 24, 940454)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 24, 934376)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 24, 942004)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 54, 24, 938314)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0022_copy_limit_to_uplimit.py b/snf-astakos-app/astakos/im/migrations/0022_copy_limit_to_uplimit.py
deleted file mode 100644
index eefa31015df849a4ea269675070d1af9a08c8bf7..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0022_copy_limit_to_uplimit.py
+++ /dev/null
@@ -1,176 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        for q in orm.AstakosGroupQuota.objects.all():
-            q.uplimit = q.limit
-            q.save()
-
-    def backwards(self, orm):
-        return
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 56, 37, 729945)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 56, 37, 723535)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 56, 37, 731491)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 9, 18, 14, 56, 37, 727517)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0024_auto__chg_field_astakosgroupquota_lim.py b/snf-astakos-app/astakos/im/migrations/0024_auto__chg_field_astakosgroupquota_lim.py
deleted file mode 100644
index 3a318e34f10b118612120b8488763403df5fdb70..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0024_auto__chg_field_astakosgroupquota_lim.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Changing field 'AstakosGroupQuota.limit'
-        db.alter_column('im_astakosgroupquota', 'limit', self.gf('django.db.models.fields.PositiveIntegerField')(null=True))
-
-        # Changing field 'AstakosUserQuota.limit'
-        db.alter_column('im_astakosuserquota', 'limit', self.gf('django.db.models.fields.PositiveIntegerField')(null=True))
-
-
-    def backwards(self, orm):
-        pass
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 2, 10, 33, 53, 42109)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 2, 10, 33, 53, 36319)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 2, 10, 33, 53, 43584)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 10, 2, 10, 33, 53, 40054)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0025_case_insensitive_emails.py b/snf-astakos-app/astakos/im/migrations/0025_case_insensitive_emails.py
deleted file mode 100644
index 3e03cc5bbb5ee6b8aa81460171b6fa00861647ef..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0025_case_insensitive_emails.py
+++ /dev/null
@@ -1,178 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        "Write your forwards methods here."
-        for u in orm.AstakosUser.objects.all():
-            u.email = u.email.lower()
-            u.save()
-
-
-    def backwards(self, orm):
-        pass
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 4, 9, 47, 13, 40029)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 4, 9, 47, 13, 34050)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 4, 9, 47, 13, 41566)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 10, 4, 9, 47, 13, 37772)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0026_auto__add_field_resource_desc__add_field_resource_unit.py b/snf-astakos-app/astakos/im/migrations/0026_auto__add_field_resource_desc__add_field_resource_unit.py
deleted file mode 100644
index ef8c740d50740263a61a5a110d3d55896ff1abea..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0026_auto__add_field_resource_desc__add_field_resource_unit.py
+++ /dev/null
@@ -1,187 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Resource.desc'
-        db.add_column('im_resource', 'desc', self.gf('django.db.models.fields.TextField')(null=True), keep_default=False)
-
-        # Adding field 'Resource.unit'
-        db.add_column('im_resource', 'unit', self.gf('django.db.models.fields.CharField')(max_length=255, null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Resource.desc'
-        db.delete_column('im_resource', 'desc')
-
-        # Deleting field 'Resource.unit'
-        db.delete_column('im_resource', 'unit')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 30, 16, 37, 5, 608037)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 30, 16, 37, 5, 601308)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 10, 30, 16, 37, 5, 609676)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 10, 30, 16, 37, 5, 605488)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0027_auto__add_field_resource_group.py b/snf-astakos-app/astakos/im/migrations/0027_auto__add_field_resource_group.py
deleted file mode 100644
index df847cfc17764d30ca5639c41d08c5450d49c93d..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0027_auto__add_field_resource_group.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Resource.group'
-        db.add_column('im_resource', 'group', self.gf('django.db.models.fields.CharField')(max_length=255, null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Resource.group'
-        db.delete_column('im_resource', 'group')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 19, 866217)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 19, 860127)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 19, 867741)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 19, 863952)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0028_auto__add_field_astakosuser_disturbed_quota.py b/snf-astakos-app/astakos/im/migrations/0028_auto__add_field_astakosuser_disturbed_quota.py
deleted file mode 100644
index a157ad5fce6ff427168bd16edbb07658c0bb2170..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0028_auto__add_field_astakosuser_disturbed_quota.py
+++ /dev/null
@@ -1,183 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'AstakosUser.disturbed_quota'
-        db.add_column('im_astakosuser', 'disturbed_quota', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'AstakosUser.disturbed_quota'
-        db.delete_column('im_astakosuser', 'disturbed_quota')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 41, 105536)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 41, 99282)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 41, 107071)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 41, 103264)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0029_auto__add_field_astakosgroup_max_participants.py b/snf-astakos-app/astakos/im/migrations/0029_auto__add_field_astakosgroup_max_participants.py
deleted file mode 100644
index 01271263f5e6c06039e66c8487f39124e11c7c7b..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0029_auto__add_field_astakosgroup_max_participants.py
+++ /dev/null
@@ -1,184 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'AstakosGroup.max_participants'
-        db.add_column('im_astakosgroup', 'max_participants', self.gf('django.db.models.fields.PositiveIntegerField')(null=True, blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'AstakosGroup.max_participants'
-        db.delete_column('im_astakosgroup', 'max_participants')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 52, 727224)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 52, 720807)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 52, 728753)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 11, 5, 11, 38, 52, 724952)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0031_auto__add_sessioncatalog__add_pendingthirdpartyuser__add_unique_pendin.py b/snf-astakos-app/astakos/im/migrations/0031_auto__add_sessioncatalog__add_pendingthirdpartyuser__add_unique_pendin.py
deleted file mode 100644
index 26bc6305bb131bf97ae1fd76170a81305f293839..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0031_auto__add_sessioncatalog__add_pendingthirdpartyuser__add_unique_pendin.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding model 'PendingThirdPartyUser'
-        db.create_table('im_pendingthirdpartyuser', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('third_party_identifier', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('provider', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
-            ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
-            ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
-            ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
-            ('affiliation', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
-            ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)),
-        ))
-        db.send_create_signal('im', ['PendingThirdPartyUser'])
-
-        # Adding unique constraint on 'PendingThirdPartyUser', fields ['provider', 'third_party_identifier']
-        db.create_unique('im_pendingthirdpartyuser', ['provider', 'third_party_identifier'])
-
-        # Adding model 'SessionCatalog'
-        db.create_table('im_sessioncatalog', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('session_key', self.gf('django.db.models.fields.CharField')(max_length=40)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='sessions', null=True, to=orm['im.AstakosUser'])),
-        ))
-        db.send_create_signal('im', ['SessionCatalog'])
-
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'PendingThirdPartyUser', fields ['provider', 'third_party_identifier']
-        db.delete_unique('im_pendingthirdpartyuser', ['provider', 'third_party_identifier'])
-
-        # Deleting model 'PendingThirdPartyUser'
-        db.delete_table('im_pendingthirdpartyuser')
-
-        # Deleting model 'SessionCatalog'
-        db.delete_table('im_sessioncatalog')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 39, 59, 572288)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 39, 59, 566274)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 39, 59, 573980)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 39, 59, 570148)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0032_auto__add_astakosuserauthprovider__add_unique_astakosuserauthprovider_.py b/snf-astakos-app/astakos/im/migrations/0032_auto__add_astakosuserauthprovider__add_unique_astakosuserauthprovider_.py
deleted file mode 100644
index 8aa941ab3eab51665f045b1b10949ce54335df5a..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0032_auto__add_astakosuserauthprovider__add_unique_astakosuserauthprovider_.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding model 'AstakosUserAuthProvider'
-        db.create_table('im_astakosuserauthprovider', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('affiliation', self.gf('django.db.models.fields.CharField')(default=None, max_length=255, null=True, blank=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='auth_providers', to=orm['im.AstakosUser'])),
-            ('module', self.gf('django.db.models.fields.CharField')(default='local', max_length=255)),
-            ('identifier', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
-            ('active', self.gf('django.db.models.fields.BooleanField')(default=True)),
-            ('auth_backend', self.gf('django.db.models.fields.CharField')(default='astakos', max_length=255)),
-        ))
-        db.send_create_signal('im', ['AstakosUserAuthProvider'])
-
-        # Adding unique constraint on 'AstakosUserAuthProvider', fields ['identifier', 'module', 'user']
-        db.create_unique('im_astakosuserauthprovider', ['identifier', 'module', 'user_id'])
-
-        # Changing field 'AstakosUser.affiliation'
-        db.alter_column('im_astakosuser', 'affiliation', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
-
-        # Changing field 'AstakosUser.provider'
-        db.alter_column('im_astakosuser', 'provider', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
-
-        # Adding field 'PendingThirdPartyUser.token'
-        db.add_column('im_pendingthirdpartyuser', 'token', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
-
-        # Adding field 'PendingThirdPartyUser.created'
-        db.add_column('im_pendingthirdpartyuser', 'created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True, blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'AstakosUserAuthProvider', fields ['identifier', 'module', 'user']
-        db.delete_unique('im_astakosuserauthprovider', ['identifier', 'module', 'user_id'])
-
-        # Deleting model 'AstakosUserAuthProvider'
-        db.delete_table('im_astakosuserauthprovider')
-
-        # Changing field 'AstakosUser.affiliation'
-        db.alter_column('im_astakosuser', 'affiliation', self.gf('django.db.models.fields.CharField')(default='', max_length=255, null=True))
-
-        # Changing field 'AstakosUser.provider'
-        db.alter_column('im_astakosuser', 'provider', self.gf('django.db.models.fields.CharField')(default='', max_length=255))
-
-        # Deleting field 'PendingThirdPartyUser.token'
-        db.delete_column('im_pendingthirdpartyuser', 'token')
-
-        # Deleting field 'PendingThirdPartyUser.created'
-        db.delete_column('im_pendingthirdpartyuser', 'created')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 40, 35, 392345)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 40, 35, 385497)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 40, 35, 393088)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 11, 30, 13, 40, 35, 390278)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0033_multiple_auth_providers.py b/snf-astakos-app/astakos/im/migrations/0033_multiple_auth_providers.py
deleted file mode 100644
index a878b2d246a4276d2b5c74b6f6f4ea7168c77f85..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0033_multiple_auth_providers.py
+++ /dev/null
@@ -1,223 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        for user in orm.AstakosUser.objects.all():
-            if user.provider and user.provider != 'local':
-                orm.AstakosUserAuthProvider.objects.create(user=user,
-                                                           module=user.provider,
-                                                           identifier=user.third_party_identifier)
-            else:
-                orm.AstakosUserAuthProvider.objects.create(user=user,
-                                                           module='local',
-                                                           auth_backend='astakos')
-
-            user.save()
-
-    def backwards(self, orm):
-        for user in orm.AstakosUser.objects.all():
-            for auth_provider in user.auth_providers.all():
-                user.provider = auth_provider.module
-                user.third_party_identifier = auth_provider.identifier
-
-            user.save()
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 4, 11, 35, 14, 103893)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 4, 11, 35, 14, 96747)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 4, 11, 35, 14, 105406)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 4, 11, 35, 14, 101611)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0034_auto__add_field_astakosuserauthprovider_info_data__add_field_pendingth.py b/snf-astakos-app/astakos/im/migrations/0034_auto__add_field_astakosuserauthprovider_info_data__add_field_pendingth.py
deleted file mode 100644
index ce3326f6747149434b0e7161e1fa84c42fcf810c..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0034_auto__add_field_astakosuserauthprovider_info_data__add_field_pendingth.py
+++ /dev/null
@@ -1,221 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'AstakosUserAuthProvider.info_data'
-        db.add_column('im_astakosuserauthprovider', 'info_data', self.gf('django.db.models.fields.TextField')(default='', null=True, blank=True), keep_default=False)
-
-        # Adding field 'PendingThirdPartyUser.info'
-        db.add_column('im_pendingthirdpartyuser', 'info', self.gf('django.db.models.fields.TextField')(default='', null=True, blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'AstakosUserAuthProvider.info_data'
-        db.delete_column('im_astakosuserauthprovider', 'info_data')
-
-        # Deleting field 'PendingThirdPartyUser.info'
-        db.delete_column('im_pendingthirdpartyuser', 'info')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 10, 11, 53, 29, 157113)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 10, 11, 53, 29, 150144)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 10, 11, 53, 29, 158820)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 10, 11, 53, 29, 155026)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0034_auto__add_memberjoinpolicy__add_projectmembershiphistory__add_projecta.py b/snf-astakos-app/astakos/im/migrations/0034_auto__add_memberjoinpolicy__add_projectmembershiphistory__add_projecta.py
deleted file mode 100644
index 8c7f1340d86956a128409cf2f1dbe26a96ab5dbe..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0034_auto__add_memberjoinpolicy__add_projectmembershiphistory__add_projecta.py
+++ /dev/null
@@ -1,410 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding model 'MemberJoinPolicy'
-        db.create_table('im_memberjoinpolicy', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('policy', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)),
-            ('description', self.gf('django.db.models.fields.CharField')(max_length=80)),
-        ))
-        db.send_create_signal('im', ['MemberJoinPolicy'])
-
-        # Adding model 'ProjectMembershipHistory'
-        db.create_table('im_projectmembershiphistory', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('person', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser'])),
-            ('project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Project'])),
-            ('date', self.gf('django.db.models.fields.DateField')(default=datetime.datetime.now)),
-            ('reason', self.gf('django.db.models.fields.IntegerField')()),
-            ('serial', self.gf('django.db.models.fields.BigIntegerField')()),
-        ))
-        db.send_create_signal('im', ['ProjectMembershipHistory'])
-
-        # Adding model 'ProjectApplication'
-        db.create_table('im_projectapplication', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('applicant', self.gf('django.db.models.fields.related.ForeignKey')(related_name='my_project_applications', to=orm['im.AstakosUser'])),
-            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(related_name='own_project_applications', to=orm['im.AstakosUser'])),
-            ('precursor_application', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['im.ProjectApplication'], unique=True, null=True, blank=True)),
-            ('state', self.gf('django.db.models.fields.CharField')(default='Unknown', max_length=80)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=80)),
-            ('homepage', self.gf('django.db.models.fields.URLField')(max_length=255, null=True, blank=True)),
-            ('description', self.gf('django.db.models.fields.TextField')(null=True)),
-            ('start_date', self.gf('django.db.models.fields.DateTimeField')()),
-            ('end_date', self.gf('django.db.models.fields.DateTimeField')()),
-            ('member_join_policy', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.MemberJoinPolicy'])),
-            ('member_leave_policy', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.MemberLeavePolicy'])),
-            ('limit_on_members_number', self.gf('django.db.models.fields.PositiveIntegerField')(null=True, blank=True)),
-            ('comments', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('issue_date', self.gf('django.db.models.fields.DateTimeField')()),
-        ))
-        db.send_create_signal('im', ['ProjectApplication'])
-
-        # Adding model 'Project'
-        db.create_table('im_project', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('new_state', self.gf('django.db.models.fields.BigIntegerField')()),
-            ('synced_state', self.gf('django.db.models.fields.BigIntegerField')()),
-            ('sync_status', self.gf('django.db.models.fields.IntegerField')(db_index=True)),
-            ('application', self.gf('django.db.models.fields.related.OneToOneField')(related_name='project', unique=True, null=True, to=orm['im.ProjectApplication'])),
-            ('last_application_approved', self.gf('django.db.models.fields.related.OneToOneField')(related_name='last_project', unique=True, to=orm['im.ProjectApplication'])),
-            ('last_approval_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
-            ('termination_start_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
-            ('termination_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
-            ('creation_date', self.gf('django.db.models.fields.DateTimeField')()),
-            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=80, db_index=True)),
-            ('state', self.gf('django.db.models.fields.CharField')(default='Unknown', max_length=80)),
-        ))
-        db.send_create_signal('im', ['Project'])
-
-        # Adding model 'ProjectMembership'
-        db.create_table('im_projectmembership', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('new_state', self.gf('django.db.models.fields.BigIntegerField')()),
-            ('synced_state', self.gf('django.db.models.fields.BigIntegerField')()),
-            ('sync_status', self.gf('django.db.models.fields.IntegerField')(db_index=True)),
-            ('person', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser'])),
-            ('project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Project'])),
-            ('request_date', self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2012, 12, 13, 16, 50, 58, 29637))),
-            ('acceptance_date', self.gf('django.db.models.fields.DateField')(null=True, db_index=True)),
-            ('leave_request_date', self.gf('django.db.models.fields.DateField')(null=True)),
-        ))
-        db.send_create_signal('im', ['ProjectMembership'])
-
-        # Adding unique constraint on 'ProjectMembership', fields ['person', 'project']
-        db.create_unique('im_projectmembership', ['person_id', 'project_id'])
-
-        # Adding model 'MemberLeavePolicy'
-        db.create_table('im_memberleavepolicy', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('policy', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)),
-            ('description', self.gf('django.db.models.fields.CharField')(max_length=80)),
-        ))
-        db.send_create_signal('im', ['MemberLeavePolicy'])
-
-        # Adding model 'ProjectResourceGrant'
-        db.create_table('im_projectresourcegrant', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('resource', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Resource'])),
-            ('project_application', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.ProjectApplication'], blank=True)),
-            ('project_capacity', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
-            ('project_import_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
-            ('project_export_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
-            ('member_capacity', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
-            ('member_import_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
-            ('member_export_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
-        ))
-        db.send_create_signal('im', ['ProjectResourceGrant'])
-
-        # Adding unique constraint on 'ProjectResourceGrant', fields ['resource', 'project_application']
-        db.create_unique('im_projectresourcegrant', ['resource_id', 'project_application_id'])
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'ProjectResourceGrant', fields ['resource', 'project_application']
-        db.delete_unique('im_projectresourcegrant', ['resource_id', 'project_application_id'])
-
-        # Removing unique constraint on 'ProjectMembership', fields ['person', 'project']
-        db.delete_unique('im_projectmembership', ['person_id', 'project_id'])
-
-        # Deleting model 'MemberJoinPolicy'
-        db.delete_table('im_memberjoinpolicy')
-
-        # Deleting model 'ProjectMembershipHistory'
-        db.delete_table('im_projectmembershiphistory')
-
-        # Deleting model 'ProjectApplication'
-        db.delete_table('im_projectapplication')
-
-        # Deleting model 'Project'
-        db.delete_table('im_project')
-
-        # Deleting model 'ProjectMembership'
-        db.delete_table('im_projectmembership')
-
-        # Deleting model 'MemberLeavePolicy'
-        db.delete_table('im_memberleavepolicy')
-
-        # Deleting model 'ProjectResourceGrant'
-        db.delete_table('im_projectresourcegrant')
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 58, 1095)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 57, 993338)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 58, 2937)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 57, 998898)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_application_approved': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 58, 29637)'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0035_auto__add_field_astakosuserauthprovider_created.py b/snf-astakos-app/astakos/im/migrations/0035_auto__add_field_astakosuserauthprovider_created.py
deleted file mode 100644
index 48b0cdf53005c7daaa241f4bfd463ecf52fe4d1a..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0035_auto__add_field_astakosuserauthprovider_created.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'AstakosUserAuthProvider.created'
-        db.add_column('im_astakosuserauthprovider', 'created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2012, 12, 10, 13, 49, 10, 932114), blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'AstakosUserAuthProvider.created'
-        db.delete_column('im_astakosuserauthprovider', 'created')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 10, 13, 49, 0, 931016)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 10, 13, 49, 0, 927337)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('created', 'module')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 10, 13, 49, 0, 931914)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 10, 13, 49, 0, 929917)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_application_approved': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 58, 29637)'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0036_auto__del_unique_astakosuser_third_party_identifier_provider.py b/snf-astakos-app/astakos/im/migrations/0036_auto__del_unique_astakosuser_third_party_identifier_provider.py
deleted file mode 100644
index bdf9a021b61bd91b9df4ddc04e0349193b05d6cb..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0036_auto__del_unique_astakosuser_third_party_identifier_provider.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Removing unique constraint on 'AstakosUser', fields ['third_party_identifier', 'provider']
-        db.delete_unique('im_astakosuser', ['third_party_identifier', 'provider'])
-
-
-    def backwards(self, orm):
-        
-        # Adding unique constraint on 'AstakosUser', fields ['third_party_identifier', 'provider']
-        db.create_unique('im_astakosuser', ['third_party_identifier', 'provider'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 11, 13, 35, 17, 903170)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 11, 13, 35, 17, 899292)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 11, 13, 35, 17, 904623)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 11, 13, 35, 17, 901603)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_application_approved': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 58, 29637)'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0037_activation_sent.py b/snf-astakos-app/astakos/im/migrations/0037_activation_sent.py
deleted file mode 100644
index 043f24171cef8296cfabdbbd4df283dd16afa754..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0037_activation_sent.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        for user in orm.AstakosUser.objects.filter(is_active=True):
-            if not user.activation_sent:
-                user.activation_sent = datetime.datetime.now()
-                user.email_verified = True
-                user.save()
-
-
-    def backwards(self, orm):
-        "Write your backwards methods here."
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 449628)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 445899)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 450405)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 448522)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_application_approved': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 58, 29637)'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0038_auto__add_field_astakosuser_uuid.py b/snf-astakos-app/astakos/im/migrations/0038_auto__add_field_astakosuser_uuid.py
deleted file mode 100644
index 33e96fb75465273a0ba89809890ac62ab3a14740..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0038_auto__add_field_astakosuser_uuid.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'AstakosUser.uuid'
-        db.add_column('im_astakosuser', 'uuid', self.gf('django.db.models.fields.CharField')(max_length=255, unique=True, null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'AstakosUser.uuid'
-        db.delete_column('im_astakosuser', 'uuid')
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 449628)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 445899)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 450405)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 12, 13, 5, 48, 448522)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_application_approved': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 13, 16, 50, 58, 29637)'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0038_auto__del_field_project_state__del_field_project_application__del_fiel.py b/snf-astakos-app/astakos/im/migrations/0038_auto__del_field_project_state__del_field_project_application__del_fiel.py
deleted file mode 100644
index 203146c8e62a4ab8cee559df2f6c9d427be0c867..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0038_auto__del_field_project_state__del_field_project_application__del_fiel.py
+++ /dev/null
@@ -1,325 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting field 'Project.state'
-        db.delete_column('im_project', 'state')
-
-        # Deleting field 'Project.application'
-        db.delete_column('im_project', 'application_id')
-
-        # Deleting field 'Project.last_application_approved'
-        db.delete_column('im_project', 'last_application_approved_id')
-
-        # Adding field 'Project.synced_application'
-        db.add_column('im_project', 'synced_application', self.gf('django.db.models.fields.related.OneToOneField')(related_name='project', unique=True, null=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Adding field 'Project.latest_application'
-        db.add_column('im_project', 'latest_application', self.gf('django.db.models.fields.related.OneToOneField')(default=None, related_name='last_project', unique=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Adding field 'Project.status'
-        db.add_column('im_project', 'status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-    def backwards(self, orm):
-        
-        # Adding field 'Project.state'
-        db.add_column('im_project', 'state', self.gf('django.db.models.fields.CharField')(default='Unknown', max_length=80), keep_default=False)
-
-        # Adding field 'Project.application'
-        db.add_column('im_project', 'application', self.gf('django.db.models.fields.related.OneToOneField')(related_name='project', unique=True, null=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Adding field 'Project.last_application_approved'
-        db.add_column('im_project', 'last_application_approved', self.gf('django.db.models.fields.related.OneToOneField')(default=None, related_name='last_project', unique=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Deleting field 'Project.synced_application'
-        db.delete_column('im_project', 'synced_application_id')
-
-        # Deleting field 'Project.latest_application'
-        db.delete_column('im_project', 'latest_application_id')
-
-        # Deleting field 'Project.status'
-        db.delete_column('im_project', 'status')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 14, 16, 17, 50, 153576)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 14, 16, 17, 50, 145737)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 14, 16, 17, 50, 155268)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 14, 16, 17, 50, 151219)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'latest_application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 14, 16, 17, 50, 181802)'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0039_auto__del_unique_resource_name__add_unique_resource_name_service.py b/snf-astakos-app/astakos/im/migrations/0039_auto__del_unique_resource_name__add_unique_resource_name_service.py
deleted file mode 100644
index 06e728e7c7dd8e07761303b09bf5fd9d1917eb5d..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0039_auto__del_unique_resource_name__add_unique_resource_name_service.py
+++ /dev/null
@@ -1,308 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Removing unique constraint on 'Resource', fields ['name']
-        db.delete_unique('im_resource', ['name'])
-
-        # Removing index on 'Resource', fields ['name']
-#         db.delete_index('im_resource', ['name'])
-        
-        # Adding unique constraint on 'Resource', fields ['name', 'service']
-        db.create_unique('im_resource', ['name', 'service_id'])
-
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'Resource', fields ['name', 'service']
-        db.delete_unique('im_resource', ['name', 'service_id'])
-
-        # Adding index on 'Resource', fields ['name']
-#         db.create_index('im_resource', ['name'])
-
-        # Adding unique constraint on 'Resource', fields ['name']
-        db.create_unique('im_resource', ['name'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 14, 17, 26, 39, 882349)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 14, 17, 26, 39, 874268)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 14, 17, 26, 39, 884044)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 14, 17, 26, 39, 879941)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'latest_application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'new_state': ('django.db.models.fields.BigIntegerField', [], {}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 14, 17, 26, 39, 910611)'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_state': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0040_auto__del_field_project_new_state__del_field_project_sync_status__del_.py b/snf-astakos-app/astakos/im/migrations/0040_auto__del_field_project_new_state__del_field_project_sync_status__del_.py
deleted file mode 100644
index 4ad2c94ef10efbeab9640c87c8041084b5e84a90..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0040_auto__del_field_project_new_state__del_field_project_sync_status__del_.py
+++ /dev/null
@@ -1,372 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting field 'Project.new_state'
-        db.delete_column('im_project', 'new_state')
-
-        # Deleting field 'Project.sync_status'
-        db.delete_column('im_project', 'sync_status')
-
-        # Deleting field 'Project.synced_state'
-        db.delete_column('im_project', 'synced_state')
-
-        # Adding field 'Project.app_sync_new_state'
-        db.add_column('im_project', 'app_sync_new_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'Project.app_sync_synced_state'
-        db.add_column('im_project', 'app_sync_synced_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'Project.app_sync_status'
-        db.add_column('im_project', 'app_sync_status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-        # Adding field 'Project.memb_sync_new_state'
-        db.add_column('im_project', 'memb_sync_new_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'Project.memb_sync_synced_state'
-        db.add_column('im_project', 'memb_sync_synced_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'Project.memb_sync_status'
-        db.add_column('im_project', 'memb_sync_status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-        # Deleting field 'ProjectMembership.new_state'
-        db.delete_column('im_projectmembership', 'new_state')
-
-        # Deleting field 'ProjectMembership.synced_state'
-        db.delete_column('im_projectmembership', 'synced_state')
-
-        # Adding field 'ProjectMembership.sync_new_state'
-        db.add_column('im_projectmembership', 'sync_new_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'ProjectMembership.sync_synced_state'
-        db.add_column('im_projectmembership', 'sync_synced_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Adding field 'Project.new_state'
-        db.add_column('im_project', 'new_state', self.gf('django.db.models.fields.BigIntegerField')(default=None), keep_default=False)
-
-        # Adding field 'Project.sync_status'
-        db.add_column('im_project', 'sync_status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-        # Adding field 'Project.synced_state'
-        db.add_column('im_project', 'synced_state', self.gf('django.db.models.fields.BigIntegerField')(default=None), keep_default=False)
-
-        # Deleting field 'Project.app_sync_new_state'
-        db.delete_column('im_project', 'app_sync_new_state')
-
-        # Deleting field 'Project.app_sync_synced_state'
-        db.delete_column('im_project', 'app_sync_synced_state')
-
-        # Deleting field 'Project.app_sync_status'
-        db.delete_column('im_project', 'app_sync_status')
-
-        # Deleting field 'Project.memb_sync_new_state'
-        db.delete_column('im_project', 'memb_sync_new_state')
-
-        # Deleting field 'Project.memb_sync_synced_state'
-        db.delete_column('im_project', 'memb_sync_synced_state')
-
-        # Deleting field 'Project.memb_sync_status'
-        db.delete_column('im_project', 'memb_sync_status')
-
-        # Adding field 'ProjectMembership.new_state'
-        db.add_column('im_projectmembership', 'new_state', self.gf('django.db.models.fields.BigIntegerField')(default=None), keep_default=False)
-
-        # Adding field 'ProjectMembership.synced_state'
-        db.add_column('im_projectmembership', 'synced_state', self.gf('django.db.models.fields.BigIntegerField')(default=None), keep_default=False)
-
-        # Deleting field 'ProjectMembership.sync_new_state'
-        db.delete_column('im_projectmembership', 'sync_new_state')
-
-        # Deleting field 'ProjectMembership.sync_synced_state'
-        db.delete_column('im_projectmembership', 'sync_synced_state')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 18, 11, 53, 26, 238400)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 18, 11, 53, 26, 230689)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 18, 11, 53, 26, 240308)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchange_user'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 18, 11, 53, 26, 236180)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'app_sync_new_state': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'app_sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'app_sync_synced_state': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'latest_application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'last_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'memb_sync_new_state': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'memb_sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'memb_sync_synced_state': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'synced_application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'my_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'own_project_applications'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 18, 11, 53, 26, 266987)'}),
-            'sync_new_state': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'sync_status': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'sync_synced_state': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'blank': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0041_auto__add_serial__add_field_projectapplication_project__del_field_proj.py b/snf-astakos-app/astakos/im/migrations/0041_auto__add_serial__add_field_projectapplication_project__del_field_proj.py
deleted file mode 100644
index 0586f750660d92909cebde9d7ade403f718aef91..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0041_auto__add_serial__add_field_projectapplication_project__del_field_proj.py
+++ /dev/null
@@ -1,415 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding model 'Serial'
-        db.create_table('im_serial', (
-            ('serial', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-        ))
-        db.send_create_signal('im', ['Serial'])
-
-        # Adding field 'ProjectApplication.project'
-        db.add_column('im_projectapplication', 'project', self.gf('django.db.models.fields.related.ForeignKey')(related_name='applications', null=True, to=orm['im.Project']), keep_default=False)
-
-        # Deleting field 'Project.status'
-        db.delete_column('im_project', 'status')
-
-        # Deleting field 'Project.synced_application'
-        db.delete_column('im_project', 'synced_application_id')
-
-        # Deleting field 'Project.latest_application'
-        db.delete_column('im_project', 'latest_application_id')
-
-        # Deleting field 'Project.app_sync_synced_state'
-        db.delete_column('im_project', 'app_sync_synced_state')
-
-        # Deleting field 'Project.memb_sync_new_state'
-        db.delete_column('im_project', 'memb_sync_new_state')
-
-        # Deleting field 'Project.app_sync_new_state'
-        db.delete_column('im_project', 'app_sync_new_state')
-
-        # Deleting field 'Project.memb_sync_status'
-        db.delete_column('im_project', 'memb_sync_status')
-
-        # Deleting field 'Project.app_sync_status'
-        db.delete_column('im_project', 'app_sync_status')
-
-        # Deleting field 'Project.memb_sync_synced_state'
-        db.delete_column('im_project', 'memb_sync_synced_state')
-
-        # Adding field 'Project.application'
-        db.add_column('im_project', 'application', self.gf('django.db.models.fields.related.OneToOneField')(default=None, related_name='app_project', unique=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Deleting field 'ProjectMembership.sync_status'
-        db.delete_column('im_projectmembership', 'sync_status')
-
-        # Deleting field 'ProjectMembership.sync_synced_state'
-        db.delete_column('im_projectmembership', 'sync_synced_state')
-
-        # Deleting field 'ProjectMembership.sync_new_state'
-        db.delete_column('im_projectmembership', 'sync_new_state')
-
-        # Adding field 'ProjectMembership.state'
-        db.add_column('im_projectmembership', 'state', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False)
-
-        # Adding field 'ProjectMembership.application'
-        db.add_column('im_projectmembership', 'application', self.gf('django.db.models.fields.related.ForeignKey')(related_name='memberships', null=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Adding field 'ProjectMembership.pending_application'
-        db.add_column('im_projectmembership', 'pending_application', self.gf('django.db.models.fields.related.ForeignKey')(related_name='pending_memebrships', null=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Adding field 'ProjectMembership.pending_serial'
-        db.add_column('im_projectmembership', 'pending_serial', self.gf('django.db.models.fields.BigIntegerField')(null=True, db_index=True), keep_default=False)
-
-        # Changing field 'ProjectResourceGrant.project_application'
-        db.alter_column('im_projectresourcegrant', 'project_application_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.ProjectApplication'], null=True))
-
-
-    def backwards(self, orm):
-        
-        # Deleting model 'Serial'
-        db.delete_table('im_serial')
-
-        # Deleting field 'ProjectApplication.project'
-        db.delete_column('im_projectapplication', 'project_id')
-
-        # Adding field 'Project.status'
-        db.add_column('im_project', 'status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-        # Adding field 'Project.synced_application'
-        db.add_column('im_project', 'synced_application', self.gf('django.db.models.fields.related.OneToOneField')(related_name='project', unique=True, null=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Adding field 'Project.latest_application'
-        db.add_column('im_project', 'latest_application', self.gf('django.db.models.fields.related.OneToOneField')(default=None, related_name='last_project', unique=True, to=orm['im.ProjectApplication']), keep_default=False)
-
-        # Adding field 'Project.app_sync_synced_state'
-        db.add_column('im_project', 'app_sync_synced_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'Project.memb_sync_new_state'
-        db.add_column('im_project', 'memb_sync_new_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'Project.app_sync_new_state'
-        db.add_column('im_project', 'app_sync_new_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'Project.memb_sync_status'
-        db.add_column('im_project', 'memb_sync_status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-        # Adding field 'Project.app_sync_status'
-        db.add_column('im_project', 'app_sync_status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-        # Adding field 'Project.memb_sync_synced_state'
-        db.add_column('im_project', 'memb_sync_synced_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Deleting field 'Project.application'
-        db.delete_column('im_project', 'application_id')
-
-        # Adding field 'ProjectMembership.sync_status'
-        db.add_column('im_projectmembership', 'sync_status', self.gf('django.db.models.fields.IntegerField')(default=None, db_index=True), keep_default=False)
-
-        # Adding field 'ProjectMembership.sync_synced_state'
-        db.add_column('im_projectmembership', 'sync_synced_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'ProjectMembership.sync_new_state'
-        db.add_column('im_projectmembership', 'sync_new_state', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Deleting field 'ProjectMembership.state'
-        db.delete_column('im_projectmembership', 'state')
-
-        # Deleting field 'ProjectMembership.application'
-        db.delete_column('im_projectmembership', 'application_id')
-
-        # Deleting field 'ProjectMembership.pending_application'
-        db.delete_column('im_projectmembership', 'pending_application_id')
-
-        # Deleting field 'ProjectMembership.pending_serial'
-        db.delete_column('im_projectmembership', 'pending_serial')
-
-        # Changing field 'ProjectResourceGrant.project_application'
-        db.alter_column('im_projectresourcegrant', 'project_application_id', self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['im.ProjectApplication']))
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 18, 17, 50, 42, 136815)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 18, 17, 50, 42, 128806)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 18, 17, 50, 42, 138620)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 18, 17, 50, 42, 134386)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'app_project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'applications'", 'null': 'True', 'to': "orm['im.Project']"}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 18, 17, 50, 42, 163986)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0042_auto__del_field_projectapplication_project.py b/snf-astakos-app/astakos/im/migrations/0042_auto__del_field_projectapplication_project.py
deleted file mode 100644
index 339655f654b078f574ba0b336ed518a4bf56f32f..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0042_auto__del_field_projectapplication_project.py
+++ /dev/null
@@ -1,297 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting field 'ProjectApplication.project'
-        db.delete_column('im_projectapplication', 'project_id')
-
-
-    def backwards(self, orm):
-        
-        # Adding field 'ProjectApplication.project'
-        db.add_column('im_projectapplication', 'project', self.gf('django.db.models.fields.related.ForeignKey')(related_name='applications', null=True, to=orm['im.Project']), keep_default=False)
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 413677)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosgroup': {
-            'Meta': {'object_name': 'AstakosGroup', '_ormbases': ['auth.Group']},
-            'approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 404439)'}),
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'estimated_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'expiration_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'group_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True', 'primary_key': 'True'}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'kind': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.GroupKind']"}),
-            'max_participants': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'moderation_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosGroupQuota']", 'blank': 'True'})
-        },
-        'im.astakosgroupquota': {
-            'Meta': {'unique_together': "(('resource', 'group'),)", 'object_name': 'AstakosGroupQuota'},
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']", 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'astakos_groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosGroup']", 'symmetrical': 'False', 'through': "orm['im.Membership']", 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'owner': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'owner'", 'null': 'True', 'to': "orm['im.AstakosGroup']"}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 415411)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.groupkind': {
-            'Meta': {'object_name': 'GroupKind'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.membership': {
-            'Meta': {'unique_together': "(('person', 'group'),)", 'object_name': 'Membership'},
-            'date_joined': ('django.db.models.fields.DateField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'date_requested': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 410862)', 'blank': 'True'}),
-            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosGroup']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 19, 10, 44, 7, 447638)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0043_auto__del_groupkind__del_membership__del_unique_membership_person_grou.py b/snf-astakos-app/astakos/im/migrations/0043_auto__del_groupkind__del_membership__del_unique_membership_person_grou.py
deleted file mode 100644
index 4cf6908fe281c1534d595f06d662585f4d041b3e..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0043_auto__del_groupkind__del_membership__del_unique_membership_person_grou.py
+++ /dev/null
@@ -1,331 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Removing unique constraint on 'AstakosGroupQuota', fields ['resource', 'group']
-        db.delete_unique('im_astakosgroupquota', ['resource_id', 'group_id'])
-
-        # Removing unique constraint on 'Membership', fields ['person', 'group']
-        db.delete_unique('im_membership', ['person_id', 'group_id'])
-
-        # Deleting model 'GroupKind'
-        db.delete_table('im_groupkind')
-
-        # Deleting model 'Membership'
-        db.delete_table('im_membership')
-
-        # Deleting model 'AstakosGroupQuota'
-        db.delete_table('im_astakosgroupquota')
-
-        # Deleting model 'AstakosGroup'
-        db.delete_table('im_astakosgroup')
-
-        # Removing M2M table for field owner on 'AstakosUser'
-        db.delete_table('im_astakosuser_owner')
-
-
-    def backwards(self, orm):
-        
-        # Adding model 'GroupKind'
-        db.create_table('im_groupkind', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=255, unique=True, db_index=True)),
-        ))
-        db.send_create_signal('im', ['GroupKind'])
-
-        # Adding model 'Membership'
-        db.create_table('im_membership', (
-            ('date_requested', self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2012, 12, 19, 10, 44, 7, 410862), blank=True)),
-            ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosGroup'])),
-            ('person', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser'])),
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('date_joined', self.gf('django.db.models.fields.DateField')(blank=True, null=True, db_index=True)),
-        ))
-        db.send_create_signal('im', ['Membership'])
-
-        # Adding unique constraint on 'Membership', fields ['person', 'group']
-        db.create_unique('im_membership', ['person_id', 'group_id'])
-
-        # Adding model 'AstakosGroupQuota'
-        db.create_table('im_astakosgroupquota', (
-            ('uplimit', self.gf('django.db.models.fields.BigIntegerField')(null=True)),
-            ('resource', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Resource'])),
-            ('limit', self.gf('django.db.models.fields.PositiveIntegerField')(null=True)),
-            ('group', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosGroup'], blank=True)),
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-        ))
-        db.send_create_signal('im', ['AstakosGroupQuota'])
-
-        # Adding unique constraint on 'AstakosGroupQuota', fields ['resource', 'group']
-        db.create_unique('im_astakosgroupquota', ['resource_id', 'group_id'])
-
-        # Adding model 'AstakosGroup'
-        db.create_table('im_astakosgroup', (
-            ('estimated_participants', self.gf('django.db.models.fields.PositiveIntegerField')(null=True, blank=True)),
-            ('approval_date', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)),
-            ('creation_date', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2012, 12, 19, 10, 44, 7, 404439))),
-            ('group_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.Group'], unique=True, primary_key=True)),
-            ('max_participants', self.gf('django.db.models.fields.PositiveIntegerField')(null=True, blank=True)),
-            ('kind', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.GroupKind'])),
-            ('desc', self.gf('django.db.models.fields.TextField')(null=True)),
-            ('issue_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
-            ('moderation_enabled', self.gf('django.db.models.fields.BooleanField')(default=True)),
-            ('expiration_date', self.gf('django.db.models.fields.DateTimeField')(null=True)),
-            ('homepage', self.gf('django.db.models.fields.URLField')(max_length=255, null=True, blank=True)),
-        ))
-        db.send_create_signal('im', ['AstakosGroup'])
-
-        # Adding M2M table for field owner on 'AstakosUser'
-        db.create_table('im_astakosuser_owner', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('astakosuser', models.ForeignKey(orm['im.astakosuser'], null=False)),
-            ('astakosgroup', models.ForeignKey(orm['im.astakosgroup'], null=False))
-        ))
-        db.create_unique('im_astakosuser_owner', ['astakosuser_id', 'astakosgroup_id'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 21, 15, 16, 33, 348857)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 21, 15, 16, 33, 350617)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 21, 15, 16, 33, 359021)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0044_increase_username_length.py b/snf-astakos-app/astakos/im/migrations/0044_increase_username_length.py
deleted file mode 100644
index 2282d66ce6df7d859b697c616144745cba315f14..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0044_increase_username_length.py
+++ /dev/null
@@ -1,256 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        db.alter_column('auth_user', 'username', models.CharField(max_length=75))
-
-
-
-    def backwards(self, orm):
-        db.alter_column('auth_user', 'username', models.CharField(max_length=30))
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '75'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 28, 9, 53, 50, 925949)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 28, 9, 53, 50, 927617)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 28, 9, 53, 50, 935918)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0045_set_username_uuid.py b/snf-astakos-app/astakos/im/migrations/0045_set_username_uuid.py
deleted file mode 100644
index eca653f8606710183b10ef81a646633c8826ae98..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0045_set_username_uuid.py
+++ /dev/null
@@ -1,280 +0,0 @@
-# encoding: utf-8
-import datetime
-import uuid
-
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-from django.core.validators import email_re
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        for u in orm.AstakosUser.objects.all():
-            save = False
-            while not u.uuid:
-                uuid_val =  str(uuid.uuid4())
-                try:
-                    orm.AstakosUser.objects.get(uuid=uuid_val)
-                except orm.AstakosUser.DoesNotExist, e:
-                    u.uuid = uuid_val
-                    save = True
-            if not email_re.match(u.username):
-                u.username = u.email.lower()
-                save = True
-            if save:
-                u.save()
-
-    def backwards(self, orm):
-        for u in orm.AstakosUser.objects.all():
-            u.uuid = None
-            if email_re.match(u.username):
-                username = None
-                while not username:
-                    username_val =  uuid.uuid4().hex[:30]
-                    try:
-                        orm.AstakosUser.objects.get(username = username_val)
-                    except orm.AstakosUser.DoesNotExist, e:
-                        username = username_val
-                u.username = username
-            u.save()
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '75'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 28, 10, 3, 44, 519671)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 28, 10, 3, 44, 521365)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 28, 10, 3, 44, 529721)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0046_clear_service_auth_token_expires.py b/snf-astakos-app/astakos/im/migrations/0046_clear_service_auth_token_expires.py
deleted file mode 100644
index 1b4b44997e3f681e9614141156d944dc25cc1bef..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0046_clear_service_auth_token_expires.py
+++ /dev/null
@@ -1,256 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        for s in orm.Service.objects.all():
-            s.auth_token_expires = None
-            s.save()
-
-    def backwards(self, orm):
-        "Write your backwards methods here."
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '75'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 28, 11, 55, 39, 180898)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 12, 28, 11, 55, 39, 182612)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2012, 12, 28, 11, 55, 39, 190907)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0047_auto__chg_field_projectmembershiphistory_project__chg_field_projectmem.py b/snf-astakos-app/astakos/im/migrations/0047_auto__chg_field_projectmembershiphistory_project__chg_field_projectmem.py
deleted file mode 100644
index bbd6586add7aa6467b07e8f99fb9c52826d609bd..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0047_auto__chg_field_projectmembershiphistory_project__chg_field_projectmem.py
+++ /dev/null
@@ -1,285 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Renaming column for 'ProjectMembershipHistory.project' to match new field type.
-        db.rename_column('im_projectmembershiphistory', 'project_id', 'project')
-        # Changing field 'ProjectMembershipHistory.project'
-        db.alter_column('im_projectmembershiphistory', 'project', self.gf('django.db.models.fields.BigIntegerField')())
-
-        # Removing index on 'ProjectMembershipHistory', fields ['project']
-        db.delete_index('im_projectmembershiphistory', ['project_id'])
-
-        # Renaming column for 'ProjectMembershipHistory.person' to match new field type.
-        db.rename_column('im_projectmembershiphistory', 'person_id', 'person')
-        # Changing field 'ProjectMembershipHistory.person'
-        db.alter_column('im_projectmembershiphistory', 'person', self.gf('django.db.models.fields.CharField')(max_length=255))
-
-        # Removing index on 'ProjectMembershipHistory', fields ['person']
-        db.delete_index('im_projectmembershiphistory', ['person_id'])
-
-
-    def backwards(self, orm):
-        
-        # Adding index on 'ProjectMembershipHistory', fields ['person']
-        db.create_index('im_projectmembershiphistory', ['person_id'])
-
-        # Adding index on 'ProjectMembershipHistory', fields ['project']
-        db.create_index('im_projectmembershiphistory', ['project_id'])
-
-        # Renaming column for 'ProjectMembershipHistory.project' to match new field type.
-        db.rename_column('im_projectmembershiphistory', 'project', 'project_id')
-        # Changing field 'ProjectMembershipHistory.project'
-        db.alter_column('im_projectmembershiphistory', 'project_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.Project']))
-
-        # Renaming column for 'ProjectMembershipHistory.person' to match new field type.
-        db.rename_column('im_projectmembershiphistory', 'person', 'person_id')
-        # Changing field 'ProjectMembershipHistory.person'
-        db.alter_column('im_projectmembershiphistory', 'person_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.AstakosUser']))
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 3, 14, 50, 9, 436904)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 3, 14, 50, 9, 437613)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'termination_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'termination_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 3, 14, 50, 9, 441674)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0048_auto__del_field_project_termination_date__del_field_project_terminatio.py b/snf-astakos-app/astakos/im/migrations/0048_auto__del_field_project_termination_date__del_field_project_terminatio.py
deleted file mode 100644
index c39d94de44f948ee0749dbc9dbbd7ed3570854aa..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0048_auto__del_field_project_termination_date__del_field_project_terminatio.py
+++ /dev/null
@@ -1,284 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting field 'Project.termination_date'
-        db.delete_column('im_project', 'termination_date')
-
-        # Deleting field 'Project.termination_start_date'
-        db.delete_column('im_project', 'termination_start_date')
-
-        # Adding field 'Project.deactivation_reason'
-        db.add_column('im_project', 'deactivation_reason', self.gf('django.db.models.fields.CharField')(max_length=255, null=True), keep_default=False)
-
-        # Adding field 'Project.deactivation_start_date'
-        db.add_column('im_project', 'deactivation_start_date', self.gf('django.db.models.fields.DateTimeField')(null=True), keep_default=False)
-
-        # Adding field 'Project.deactivation_date'
-        db.add_column('im_project', 'deactivation_date', self.gf('django.db.models.fields.DateTimeField')(null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Adding field 'Project.termination_date'
-        db.add_column('im_project', 'termination_date', self.gf('django.db.models.fields.DateTimeField')(null=True), keep_default=False)
-
-        # Adding field 'Project.termination_start_date'
-        db.add_column('im_project', 'termination_start_date', self.gf('django.db.models.fields.DateTimeField')(null=True), keep_default=False)
-
-        # Deleting field 'Project.deactivation_reason'
-        db.delete_column('im_project', 'deactivation_reason')
-
-        # Deleting field 'Project.deactivation_start_date'
-        db.delete_column('im_project', 'deactivation_start_date')
-
-        # Deleting field 'Project.deactivation_date'
-        db.delete_column('im_project', 'deactivation_date')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 4, 16, 53, 25, 493244)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 4, 16, 53, 25, 493977)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.memberjoinpolicy': {
-            'Meta': {'object_name': 'MemberJoinPolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.memberleavepolicy': {
-            'Meta': {'object_name': 'MemberLeavePolicy'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'policy': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'deactivation_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'member_join_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberJoinPolicy']"}),
-            'member_leave_policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.MemberLeavePolicy']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 4, 16, 53, 25, 498080)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'member_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'project_import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0049_auto__del_memberleavepolicy__del_memberjoinpolicy__chg_field_projectre.py b/snf-astakos-app/astakos/im/migrations/0049_auto__del_memberleavepolicy__del_memberjoinpolicy__chg_field_projectre.py
deleted file mode 100644
index 8da8fd5127602e3fb892a33e3c62e90292a82f65..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0049_auto__del_memberleavepolicy__del_memberjoinpolicy__chg_field_projectre.py
+++ /dev/null
@@ -1,332 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting model 'MemberLeavePolicy'
-        db.delete_table('im_memberleavepolicy')
-
-        # Deleting model 'MemberJoinPolicy'
-        db.delete_table('im_memberjoinpolicy')
-
-        # Changing field 'ProjectResourceGrant.project_export_limit'
-        db.alter_column('im_projectresourcegrant', 'project_export_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
-
-        # Changing field 'ProjectResourceGrant.project_import_limit'
-        db.alter_column('im_projectresourcegrant', 'project_import_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
-
-        # Changing field 'ProjectResourceGrant.member_export_limit'
-        db.alter_column('im_projectresourcegrant', 'member_export_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
-
-        # Changing field 'ProjectResourceGrant.member_capacity'
-        db.alter_column('im_projectresourcegrant', 'member_capacity', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
-
-        # Changing field 'ProjectResourceGrant.member_import_limit'
-        db.alter_column('im_projectresourcegrant', 'member_import_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
-
-        # Changing field 'ProjectResourceGrant.project_capacity'
-        db.alter_column('im_projectresourcegrant', 'project_capacity', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
-
-        # Renaming column for 'ProjectApplication.member_join_policy' to match new field type.
-        db.rename_column('im_projectapplication', 'member_join_policy_id', 'member_join_policy')
-        # Changing field 'ProjectApplication.member_join_policy'
-        db.alter_column('im_projectapplication', 'member_join_policy', self.gf('django.db.models.fields.IntegerField')())
-
-        # Removing index on 'ProjectApplication', fields ['member_join_policy']
-        db.delete_index('im_projectapplication', ['member_join_policy_id'])
-
-        # Renaming column for 'ProjectApplication.member_leave_policy' to match new field type.
-        db.rename_column('im_projectapplication', 'member_leave_policy_id', 'member_leave_policy')
-        # Changing field 'ProjectApplication.member_leave_policy'
-        db.alter_column('im_projectapplication', 'member_leave_policy', self.gf('django.db.models.fields.IntegerField')())
-
-        # Removing index on 'ProjectApplication', fields ['member_leave_policy']
-        db.delete_index('im_projectapplication', ['member_leave_policy_id'])
-
-
-    def backwards(self, orm):
-        
-        # Adding model 'MemberLeavePolicy'
-        db.create_table('im_memberleavepolicy', (
-            ('policy', self.gf('django.db.models.fields.CharField')(max_length=255, unique=True, db_index=True)),
-            ('description', self.gf('django.db.models.fields.CharField')(max_length=80)),
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-        ))
-        db.send_create_signal('im', ['MemberLeavePolicy'])
-
-        # Adding model 'MemberJoinPolicy'
-        db.create_table('im_memberjoinpolicy', (
-            ('policy', self.gf('django.db.models.fields.CharField')(max_length=255, unique=True, db_index=True)),
-            ('description', self.gf('django.db.models.fields.CharField')(max_length=80)),
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-        ))
-        db.send_create_signal('im', ['MemberJoinPolicy'])
-
-        # Changing field 'ProjectResourceGrant.project_export_limit'
-        db.alter_column('im_projectresourcegrant', 'project_export_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True))
-
-        # Changing field 'ProjectResourceGrant.project_import_limit'
-        db.alter_column('im_projectresourcegrant', 'project_import_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True))
-
-        # Changing field 'ProjectResourceGrant.member_export_limit'
-        db.alter_column('im_projectresourcegrant', 'member_export_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True))
-
-        # Changing field 'ProjectResourceGrant.member_capacity'
-        db.alter_column('im_projectresourcegrant', 'member_capacity', self.gf('django.db.models.fields.BigIntegerField')(null=True))
-
-        # Changing field 'ProjectResourceGrant.member_import_limit'
-        db.alter_column('im_projectresourcegrant', 'member_import_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True))
-
-        # Changing field 'ProjectResourceGrant.project_capacity'
-        db.alter_column('im_projectresourcegrant', 'project_capacity', self.gf('django.db.models.fields.BigIntegerField')(null=True))
-
-        # Renaming column for 'ProjectApplication.member_join_policy' to match new field type.
-        db.rename_column('im_projectapplication', 'member_join_policy', 'member_join_policy_id')
-        # Changing field 'ProjectApplication.member_join_policy'
-        db.alter_column('im_projectapplication', 'member_join_policy_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.MemberJoinPolicy']))
-
-        # Renaming column for 'ProjectApplication.member_leave_policy' to match new field type.
-        db.rename_column('im_projectapplication', 'member_leave_policy', 'member_leave_policy_id')
-        # Changing field 'ProjectApplication.member_leave_policy'
-        db.alter_column('im_projectapplication', 'member_leave_policy_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['im.MemberLeavePolicy']))
-
-        # Adding index on 'ProjectApplication', fields ['member_leave_policy']
-        db.create_index('im_projectapplication', ['member_leave_policy_id'])
-
-        # Adding index on 'ProjectApplication', fields ['member_join_policy']
-        db.create_index('im_projectapplication', ['member_join_policy_id'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 7, 15, 0, 24, 50514)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 7, 15, 0, 24, 51288)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'deactivation_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 7, 15, 0, 24, 54113)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0050_auto__chg_field_projectapplication_start_date.py b/snf-astakos-app/astakos/im/migrations/0050_auto__chg_field_projectapplication_start_date.py
deleted file mode 100644
index 4e651d44d3ad9b8fddfc80725c446d65a1d127d3..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0050_auto__chg_field_projectapplication_start_date.py
+++ /dev/null
@@ -1,248 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Changing field 'ProjectApplication.start_date'
-        db.alter_column('im_projectapplication', 'start_date', self.gf('django.db.models.fields.DateTimeField')(null=True))
-
-
-    def backwards(self, orm):
-        
-        # Changing field 'ProjectApplication.start_date'
-        db.alter_column('im_projectapplication', 'start_date', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2013, 1, 7, 17, 4, 55, 329675)))
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 7, 17, 4, 37, 426585)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 7, 17, 4, 37, 428891)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'deactivation_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 7, 17, 4, 37, 442520)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0051_auto__add_field_service_order.py b/snf-astakos-app/astakos/im/migrations/0051_auto__add_field_service_order.py
deleted file mode 100644
index 18e57b2e470052b805d0043fd71540c88f4a32cd..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0051_auto__add_field_service_order.py
+++ /dev/null
@@ -1,249 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Service.order'
-        db.add_column('im_service', 'order', self.gf('django.db.models.fields.PositiveIntegerField')(default=0), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Service.order'
-        db.delete_column('im_service', 'order')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 9, 12, 50, 55, 170085)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'limit': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'uplimit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 9, 12, 50, 55, 170887)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'deactivation_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 9, 12, 50, 55, 174455)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0051_auto__del_field_astakosuserquota_uplimit__del_field_astakosuserquota_l.py b/snf-astakos-app/astakos/im/migrations/0051_auto__del_field_astakosuserquota_uplimit__del_field_astakosuserquota_l.py
deleted file mode 100644
index 0043809ad1c872e5a73c2b1f22a84386f3227775..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0051_auto__del_field_astakosuserquota_uplimit__del_field_astakosuserquota_l.py
+++ /dev/null
@@ -1,281 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting field 'AstakosUserQuota.uplimit'
-        db.delete_column('im_astakosuserquota', 'uplimit')
-
-        # Deleting field 'AstakosUserQuota.limit'
-        db.delete_column('im_astakosuserquota', 'limit')
-
-        # Adding field 'AstakosUserQuota.capacity'
-        db.add_column('im_astakosuserquota', 'capacity', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'AstakosUserQuota.quantity'
-        db.add_column('im_astakosuserquota', 'quantity', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'AstakosUserQuota.export_limit'
-        db.add_column('im_astakosuserquota', 'export_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'AstakosUserQuota.import_limit'
-        db.add_column('im_astakosuserquota', 'import_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Adding field 'AstakosUserQuota.uplimit'
-        db.add_column('im_astakosuserquota', 'uplimit', self.gf('django.db.models.fields.BigIntegerField')(null=True), keep_default=False)
-
-        # Adding field 'AstakosUserQuota.limit'
-        db.add_column('im_astakosuserquota', 'limit', self.gf('django.db.models.fields.PositiveIntegerField')(null=True), keep_default=False)
-
-        # Deleting field 'AstakosUserQuota.capacity'
-        db.delete_column('im_astakosuserquota', 'capacity')
-
-        # Deleting field 'AstakosUserQuota.quantity'
-        db.delete_column('im_astakosuserquota', 'quantity')
-
-        # Deleting field 'AstakosUserQuota.export_limit'
-        db.delete_column('im_astakosuserquota', 'export_limit')
-
-        # Deleting field 'AstakosUserQuota.import_limit'
-        db.delete_column('im_astakosuserquota', 'import_limit')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 9, 16, 36, 6, 946881)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'quantity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 9, 16, 36, 6, 948602)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'deactivation_start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Unknown'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 9, 16, 36, 6, 956315)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0052_auto__del_field_project_deactivation_start_date__add_field_project_sta.py b/snf-astakos-app/astakos/im/migrations/0052_auto__del_field_project_deactivation_start_date__add_field_project_sta.py
deleted file mode 100644
index ae1ea2b48906d79c12e00dc0f8b588e4ea1f20ec..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0052_auto__del_field_project_deactivation_start_date__add_field_project_sta.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting field 'Project.deactivation_start_date'
-        db.delete_column('im_project', 'deactivation_start_date')
-
-        # Adding field 'Project.state'
-        db.add_column('im_project', 'state', self.gf('django.db.models.fields.IntegerField')(default=256, db_index=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Adding field 'Project.deactivation_start_date'
-        db.add_column('im_project', 'deactivation_start_date', self.gf('django.db.models.fields.DateTimeField')(null=True), keep_default=False)
-
-        # Deleting field 'Project.state'
-        db.delete_column('im_project', 'state')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 9, 15, 12, 22, 561243)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'quantity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 9, 15, 12, 22, 562025)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '256', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 9, 15, 12, 22, 564984)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0053_auto__add_field_project_is_modified__add_field_project_is_active__add_.py b/snf-astakos-app/astakos/im/migrations/0053_auto__add_field_project_is_modified__add_field_project_is_active__add_.py
deleted file mode 100644
index d26d6cdcfc176e902f484714c1141e7047e9faaa..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0053_auto__add_field_project_is_modified__add_field_project_is_active__add_.py
+++ /dev/null
@@ -1,279 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Project.is_modified'
-        db.add_column('im_project', 'is_modified', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True), keep_default=False)
-
-        # Adding field 'Project.is_active'
-        db.add_column('im_project', 'is_active', self.gf('django.db.models.fields.BooleanField')(default=True, db_index=True), keep_default=False)
-
-        # Adding field 'ProjectMembership.is_pending'
-        db.add_column('im_projectmembership', 'is_pending', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True), keep_default=False)
-
-        # Adding field 'ProjectMembership.is_active'
-        db.add_column('im_projectmembership', 'is_active', self.gf('django.db.models.fields.BooleanField')(default=False, db_index=True), keep_default=False)
-
-        # Adding index on 'ProjectMembership', fields ['state']
-        db.create_index('im_projectmembership', ['state'])
-
-
-    def backwards(self, orm):
-        
-        # Removing index on 'ProjectMembership', fields ['state']
-        db.delete_index('im_projectmembership', ['state'])
-
-        # Deleting field 'Project.is_modified'
-        db.delete_column('im_project', 'is_modified')
-
-        # Deleting field 'Project.is_active'
-        db.delete_column('im_project', 'is_active')
-
-        # Deleting field 'ProjectMembership.is_pending'
-        db.delete_column('im_projectmembership', 'is_pending')
-
-        # Deleting field 'ProjectMembership.is_active'
-        db.delete_column('im_projectmembership', 'is_active')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 10, 14, 25, 18, 997951)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'quantity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 10, 14, 25, 18, 998740)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'is_modified': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '1', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'is_pending': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 10, 14, 25, 19, 1887)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0054_auto__add_chain__add_field_projectapplication_chain.py b/snf-astakos-app/astakos/im/migrations/0054_auto__add_chain__add_field_projectapplication_chain.py
deleted file mode 100644
index 32dc900e0417dfc465eda9a4a48d3867fd32dc6d..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0054_auto__add_chain__add_field_projectapplication_chain.py
+++ /dev/null
@@ -1,269 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding model 'Chain'
-        db.create_table('im_chain', (
-            ('chain', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-        ))
-        db.send_create_signal('im', ['Chain'])
-
-        # Adding field 'ProjectApplication.chain'
-        db.add_column('im_projectapplication', 'chain', self.gf('django.db.models.fields.IntegerField')(default=0, db_index=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting model 'Chain'
-        db.delete_table('im_chain')
-
-        # Deleting field 'ProjectApplication.chain'
-        db.delete_column('im_projectapplication', 'chain')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 10, 16, 39, 44, 922820)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'quantity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.chain': {
-            'Meta': {'object_name': 'Chain'},
-            'chain': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 10, 16, 39, 44, 923668)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'is_modified': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '1', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'chain': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'is_pending': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 10, 16, 39, 44, 926981)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/migrations/0055_auto__add_unique_projectapplication_id_chain.py b/snf-astakos-app/astakos/im/migrations/0055_auto__add_unique_projectapplication_id_chain.py
deleted file mode 100644
index b6d411d464e24a5551a6e88b2edb45116b94f7b7..0000000000000000000000000000000000000000
--- a/snf-astakos-app/astakos/im/migrations/0055_auto__add_unique_projectapplication_id_chain.py
+++ /dev/null
@@ -1,266 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Removing index on 'ProjectApplication', fields ['chain']
-        db.delete_index('im_projectapplication', ['chain'])
-
-        # Adding unique constraint on 'ProjectApplication', fields ['id', 'chain']
-        db.create_unique('im_projectapplication', ['id', 'chain'])
-
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'ProjectApplication', fields ['id', 'chain']
-        db.delete_unique('im_projectapplication', ['id', 'chain'])
-
-        # Adding index on 'ProjectApplication', fields ['chain']
-        db.create_index('im_projectapplication', ['chain'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'im.additionalmail': {
-            'Meta': {'object_name': 'AdditionalMail'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.approvalterms': {
-            'Meta': {'object_name': 'ApprovalTerms'},
-            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 11, 10, 33, 11, 335345)', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.astakosuser': {
-            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
-            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '100'}),
-            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'updated': ('django.db.models.fields.DateTimeField', [], {}),
-            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
-            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
-        },
-        'im.astakosuserauthprovider': {
-            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
-            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
-        },
-        'im.astakosuserquota': {
-            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
-            'capacity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'export_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'import_limit': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'quantity': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
-        },
-        'im.chain': {
-            'Meta': {'object_name': 'Chain'},
-            'chain': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.emailchange': {
-            'Meta': {'object_name': 'EmailChange'},
-            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 11, 10, 33, 11, 336982)'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
-        },
-        'im.invitation': {
-            'Meta': {'object_name': 'Invitation'},
-            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
-            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
-            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
-        },
-        'im.pendingthirdpartyuser': {
-            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
-            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
-            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'im.project': {
-            'Meta': {'object_name': 'Project'},
-            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'is_modified': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '1', 'db_index': 'True'})
-        },
-        'im.projectapplication': {
-            'Meta': {'unique_together': "(('chain', 'id'),)", 'object_name': 'ProjectApplication'},
-            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
-            'chain': ('django.db.models.fields.IntegerField', [], {}),
-            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
-            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'issue_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
-            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
-            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
-            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
-            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
-            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '80'})
-        },
-        'im.projectmembership': {
-            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
-            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
-            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'is_pending': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
-            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
-            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
-            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 11, 10, 33, 11, 344883)'}),
-            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
-        },
-        'im.projectmembershiphistory': {
-            'Meta': {'object_name': 'ProjectMembershipHistory'},
-            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'person': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'project': ('django.db.models.fields.BigIntegerField', [], {}),
-            'reason': ('django.db.models.fields.IntegerField', [], {}),
-            'serial': ('django.db.models.fields.BigIntegerField', [], {})
-        },
-        'im.projectresourcegrant': {
-            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
-            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
-            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
-        },
-        'im.resource': {
-            'Meta': {'unique_together': "(('name', 'service'),)", 'object_name': 'Resource'},
-            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
-            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
-        },
-        'im.resourcemetadata': {
-            'Meta': {'object_name': 'ResourceMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        'im.serial': {
-            'Meta': {'object_name': 'Serial'},
-            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'im.service': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'Service'},
-            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
-            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
-            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
-        },
-        'im.sessioncatalog': {
-            'Meta': {'object_name': 'SessionCatalog'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
-        }
-    }
-
-    complete_apps = ['im']
diff --git a/snf-astakos-app/astakos/im/models.py b/snf-astakos-app/astakos/im/models.py
index 4ff5be8a9f4d472db724c5f1029ad3a2074e45b0..d9f7997c345a581d2db7cc8553e4b753726f4471 100644
--- a/snf-astakos-app/astakos/im/models.py
+++ b/snf-astakos-app/astakos/im/models.py
@@ -1166,13 +1166,6 @@ class ProjectApplicationManager(ForUpdateManager):
         return self.filter(q)
 
 
-PROJECT_STATE_DISPLAY = {
-    'Pending': _('Pending review'),
-    'Approved': _('Active'),
-    'Replaced': _('Replaced'),
-    'Unknown': _('Unknown')
-}
-
 USER_STATUS_DISPLAY = {
     100: _('Owner'),
       0: _('Join requested'),
@@ -1194,14 +1187,17 @@ def new_chain():
 
 
 class ProjectApplication(models.Model):
-    PENDING, APPROVED, REPLACED, UNKNOWN = 'Pending', 'Approved', 'Replaced', 'Unknown'
     applicant               =   models.ForeignKey(
                                     AstakosUser,
                                     related_name='projects_applied',
                                     db_index=True)
 
-    state                   =   models.CharField(max_length=80,
-                                                default=PENDING)
+    PENDING     =    0
+    APPROVED    =    1
+    REPLACED    =    2
+    DENIED      =    3
+
+    state                   =   models.IntegerField(default=PENDING)
 
     owner                   =   models.ForeignKey(
                                     AstakosUser,
@@ -1239,8 +1235,16 @@ class ProjectApplication(models.Model):
     def __unicode__(self):
         return "%s applied by %s" % (self.name, self.applicant)
 
+    # TODO: Move to a more suitable place
+    PROJECT_STATE_DISPLAY = {
+        PENDING : _('Pending review'),
+        APPROVED: _('Active'),
+        REPLACED: _('Replaced'),
+        DENIED  : _('Denied')
+        }
+
     def state_display(self):
-        return PROJECT_STATE_DISPLAY.get(self.state, _('Unknown'))
+        return self.PROJECT_STATE_DISPLAY.get(self.state, _('Unknown'))
 
     def add_resource_policy(self, service, resource, uplimit):
         """Raises ObjectDoesNotExist, IntegrityError"""
@@ -1633,7 +1637,7 @@ class ProjectMembership(models.Model):
 
         history_item = ProjectMembershipHistory(
                             serial=self.id,
-                            person=self.person.uuid,
+                            person=self.person_id,
                             project=self.project_id,
                             date=date or datetime.now(),
                             reason=reason)
@@ -1945,7 +1949,7 @@ class ProjectMembershipHistory(models.Model):
     reasons_list    =   ['ACCEPT', 'REJECT', 'REMOVE']
     reasons         =   dict((k, v) for v, k in enumerate(reasons_list))
 
-    person  =   models.CharField(max_length=255)
+    person  =   models.BigIntegerField()
     project =   models.BigIntegerField()
     date    =   models.DateField(default=datetime.now)
     reason  =   models.IntegerField()