--- a/iconolab.txt	Thu Jun 09 12:26:14 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff-match-patch==20121119
-Django==1.9.6
-django-model-utils==2.5
-django-notifications-hq==1.1
-django-reversion==1.10.2
-django-reversion-compare==0.6.2
-djangorestframework==3.3.3
-jsonfield==1.0.3
-Pillow==3.2.0
-pytz==2016.4
-sorl-thumbnail==12.4a1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/requirements.txt	Fri Jun 10 17:07:14 2016 +0200
@@ -0,0 +1,9 @@
+diff-match-patch==20121119
+Django==1.9.6
+django-model-utils==2.5
+django-notifications-hq==1.1
+djangorestframework==3.3.3
+jsonfield==1.0.3
+Pillow==3.2.0
+pytz==2016.4
+sorl-thumbnail==12.4a1

Binary file src/db.sqlite3 has changed

--- a/src/iconolab/migrations/0001_initial.py	Thu Jun 09 12:26:14 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2016-05-11 12:01
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Annotation',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=255)),
-                ('description', models.TextField(null=True)),
-                ('fragment', models.TextField()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Collection',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=50)),
-                ('description', models.CharField(max_length=255)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Comment',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('content', models.TextField()),
-                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('target', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iconolab.Annotation')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='CommentAttachement',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('attachment_type', models.IntegerField(choices=[(1, 'link'), (2, 'image'), (3, 'pdf')], default=1)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('data', models.TextField()),
-                ('comment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='iconolab.Comment')),
-                ('main_annotation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iconolab.Annotation')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Image',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200)),
-                ('media', models.ImageField(height_field='height', upload_to='uploads/', width_field='width')),
-                ('height', models.IntegerField()),
-                ('width', models.IntegerField()),
-                ('mimetype', models.CharField(blank=True, max_length=1024, null=True)),
-                ('exif', models.TextField(blank=True, null=True)),
-                ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iconolab.Collection')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Tag',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('label', models.SlugField()),
-                ('link', models.URLField()),
-                ('description', models.TextField()),
-                ('source', models.CharField(max_length=50)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='annotation',
-            name='image',
-            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='iconolab.Image'),
-        ),
-        migrations.AddField(
-            model_name='annotation',
-            name='tags',
-            field=models.ManyToManyField(to='iconolab.Tag'),
-        ),
-    ]

--- a/src/iconolab/migrations/0002_auto_20160511_1423.py	Thu Jun 09 12:26:14 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2016-05-11 12:23
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('iconolab', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='comment',
-            name='content',
-            field=models.TextField(blank=True),
-        ),
-    ]

--- a/src/iconolab/migrations/0003_auto_20160512_1422.py	Thu Jun 09 12:26:14 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2016-05-12 12:22
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('iconolab', '0002_auto_20160511_1423'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='MetaCategories',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('label', models.CharField(max_length=200)),
-                ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iconolab.Collection')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='comment',
-            name='metacategories',
-            field=models.ManyToManyField(to='iconolab.MetaCategories'),
-        ),
-    ]

--- a/src/iconolab/migrations/0004_auto_20160512_1426.py	Thu Jun 09 12:26:14 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2016-05-12 12:26
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('iconolab', '0003_auto_20160512_1422'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='MetaCategories',
-            new_name='MetaCategory',
-        ),
-    ]

--- a/src/iconolab/migrations/0005_auto_20160517_1758.py	Thu Jun 09 12:26:14 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2016-05-17 15:58
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('iconolab', '0004_auto_20160512_1426'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Activity',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('verb', models.IntegerField(choices=[(1, 'Nouveau commentaire'), (2, 'Nouvelle révision'), (3, 'Nouveau commentaire de révision'), (4, 'New expert ans')])),
-                ('target_object_id', models.PositiveIntegerField()),
-                ('action_object_id', models.PositiveIntegerField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('action_content_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='activity_action', to='contenttypes.ContentType')),
-                ('actor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('target_content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Notification',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('status', models.IntegerField(choices=[(1, 'Lu'), (0, 'Non lu'), (2, 'Effacé')], default=0)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iconolab.Activity')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.AlterModelOptions(
-            name='metacategory',
-            options={'verbose_name_plural': 'Metacategories'},
-        ),
-        migrations.RemoveField(
-            model_name='tag',
-            name='source',
-        ),
-        migrations.AddField(
-            model_name='annotation',
-            name='author',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='annotation',
-            name='date_created',
-            field=models.DateTimeField(auto_now_add=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='annotation',
-            name='date_modified',
-            field=models.DateTimeField(auto_now=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='comment',
-            name='annotation',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='iconolab.Annotation'),
-        ),
-        migrations.AddField(
-            model_name='image',
-            name='date_created',
-            field=models.DateTimeField(auto_now_add=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='image',
-            name='date_modified',
-            field=models.DateTimeField(auto_now=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='comment',
-            name='target',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iconolab.Comment'),
-        ),
-    ]

--- a/src/iconolab/migrations/0006_folder.py	Thu Jun 09 12:26:14 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2016-05-31 12:42
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('iconolab', '0005_auto_20160517_1758'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Folder',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('label', models.CharField(max_length=255)),
-                ('images', models.ManyToManyField(to='iconolab.Image')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]