--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.md	Tue Jun 21 14:58:28 2016 +0200
@@ -0,0 +1,104 @@
+# How to start?
+
+1. Make sure PIP is installed then install Django and others dependencies with 
+
+```
+pip install -r requirements.txt
+
+```
+
+2. Move to src/iconolab/static/js to install js dependencies.
+Make sure your have installed nodejs then run the command bellow
+
+```
+npm install
+
+```
+3. To recreate the bundle file that lives in dist/
+
+```
+npm build
+
+```
+
+4. To add a new js module, you can add it to the js/components folder and then run
+
+```
+npm start
+```
+
+## ICONOLAB ##
+
+### 1. Configuration and setup
+
+### virtualenv
+
+- Install pip
+- Create a virtualenv for the project (using virtualenvwrapper is a good idea if possible). Python version is 3.5.1
+- Run
+
+	pip install -r requirements.txt
+
+
+### node.js
+
+- Make sure nodejs is installed
+- cd into iconolab/src/iconolab/static/iconolab/js and run
+	
+	npm install
+
+- To recreate the bundle file that lives in dist/
+
+	npm build
+
+- To add a new js module, you can add it to the js/components folder and then run
+	
+	npm start
+
+### Django project setup
+
+- Copy iconolab/src/settings/dev.py.tmpl into iconolab/src/settings/dev.py, adapt content to configuration
+- cd into iconolab/src folder and run
+
+    python manage.py migrate
+
+to create database tables
+
+- Run
+
+    python manage.py createsuperuser
+    
+to create an admin user
+
+- Run
+
+    python manage.py loaddata dev_initial_data
+    
+to load the provided data fixture. This fixture will create at least one of each object used in the app. Details on the fixture data below.
+
+
+### 2. Development server
+
+- cd into the iconolab/src folder and run
+
+	python manage.py runserver
+	
+By default, the app is accessible through http://127.0.0.1:8000/home
+
+
+### 3. Fixture loaded data
+
+* User: contributeur1, password: firstuser
+* User: contributeur2, password: seconduser
+
+* Collection (name): ingres
+* Image (ref): 1234567890 # You will need to move napoleon.jpg into web/media/uploads in order for the app to load the image properly
+* Annotation (guid): 34ae39ae-a9a2-4736-bc59-ba6f00e37f52
+
+To access the loaded annotation, follow:
+
+	/collections/ingres/images/1234567890/annotations/34ae39ae-a9a2-4736-bc59-ba6f00e37f52/detail
+	/collections/ingres/images/1234567890/annotations/34ae39ae-a9a2-4736-bc59-ba6f00e37f52/edit
+	
+The annotation owner is contributeur1, if you try to edit it as another user, it will create the revision but will not publish it in the current state of the project.
+	

--- a/readme.md	Tue Jun 21 14:38:09 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# How to start?
-
-1. Make sure PIP is installed then install Django and others dependencies with 
-
-```
-pip install -r requirements.txt
-
-```
-
-2. Move to src/iconolab/static/js to install js dependencies.
-Make sure your have installed nodejs then run the command bellow
-
-```
-npm install
-
-```
-3. To recreate the bundle file that lives in dist/
-
-```
-npm build
-
-```
-
-4. To add a new js module, you can add it to the js/components folder and then run
-
-```
-npm start
-```
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/iconolab/fixtures/dev_initial_data.json	Tue Jun 21 14:58:28 2016 +0200
@@ -0,0 +1,98 @@
+[
+	{
+	    "model": "auth.User",
+	    "pk": 1,
+	    "fields": {
+	    	"username": "contributeur1",
+	    	"password": "pbkdf2_sha256$24000$4t81p9toYpfc$ufZAWaUcF51dpNqHscABIoW7UyoXxYDCRlKFI87vQJM="   
+	    }
+	},{
+	    "model": "auth.User",
+	    "pk": 2,
+	    "fields": {
+	    	"username": "contributeur2",
+	    	"password": "pbkdf2_sha256$24000$b9CPP5bLU4FM$1IYIBS5y2CIEFV9jHdTdZjvj59hzx+yH5Akc5LsHo+g="
+	    }
+	},{
+	    "model": "iconolab.Collection",
+	    "pk": 1,
+	    "fields": {
+	    	"name": "ingres"
+	    }
+	},{
+	    "model": "iconolab.Item",
+	    "pk": 1,
+	    "fields": {
+	    	"collection": 1
+	    }
+	},{
+	    "model": "iconolab.ItemMetadata",
+	    "pk": 1,
+	    "fields": {
+	    	"item": 1,
+	    	"domain": "peinture",
+	    	"title": "Napoléon!",
+	    	"description": "une peinture de Napoléon",
+	    	"joconde_ref": "1234"
+	    }
+	},{
+	    "model": "iconolab.Image",
+	    "pk": 1,
+	    "fields": {
+	    	"name" : "napoleon.jpg",
+	    	"image_ref": "1234567890",
+			"media" : "uploads/napoleon.jpg",
+			"item": 1,
+			"height": 1400,
+			"width": 864,
+			"created": "2016-03-23 14:13:44.913765+01"
+	    }
+	},{
+	    "model": "iconolab.ImageStats",
+	    "pk": 1,
+	    "fields": {
+	    	"image": 1,
+	    	"annotations_count": 1,
+			"submitted_revisions_count": 1,
+			"comments_count": 0,
+			"folders_inclusion_count": 0,
+			"tag_count": 0
+	    }
+	},{
+	    "model": "iconolab.Annotation",
+	    "pk": 1,
+	    "fields": {
+	    	"annotation_guid": "34ae39ae-a9a2-4736-bc59-ba6f00e37f52",
+			"image": 1,
+			"current_revision" : 1,
+			"author": 1,
+			"created": "2016-03-24 14:13:44.913765+01"
+	    }
+	},{
+	    "model": "iconolab.AnnotationStats",
+	    "pk": 1,
+	    "fields": {
+	    	"annotation": 1,
+	    	"submitted_revisions_count": 1,
+			"accepted_revisions_count": 1,
+			"contributors_count": 1,
+			"views_count": 0,
+			"comments_count": 0,
+			"tag_count": 0
+	    }
+	},{
+	    "model": "iconolab.AnnotationRevision",
+	    "pk": 1,
+	    "fields": {
+			"annotation": 1,
+	    	"revision_guid": "b14c8382-b136-42d0-abe1-b0a94f60d9d0",
+			"author": 1,
+			"title": "Annotation sur Napoléon!",
+			"description": "Description exemple",
+	    	"fragment":"M26.720647773279353,23.625C26.720647773279353,23.625,40.48582995951417,26.375,40.48582995951417,26.375C40.48582995951417,26.375,42.71255060728745,26.125,42.71255060728745,26.125C42.71255060728745,26.125,43.11740890688259,21.625,43.11740890688259,21.625C43.11740890688259,21.625,42.10526315789473,16.875,42.10526315789473,16.875C42.10526315789473,16.875,47.16599190283401,14.375,47.16599190283401,14.375C47.16599190283401,14.375,52.63157894736842,14.5,52.63157894736842,14.5C52.63157894736842,14.5,57.28744939271255,16.5,57.28744939271255,16.5C57.28744939271255,16.5,59.10931174089069,18.875,59.10931174089069,18.875C59.10931174089069,18.875,57.48987854251012,20.75,57.48987854251012,20.75C57.48987854251012,20.75,59.311740890688256,22.625,59.311740890688256,22.625C59.311740890688256,22.625,58.502024291497975,26,58.502024291497975,26C58.502024291497975,26,65.58704453441295,27.375,65.58704453441295,27.375C65.58704453441295,27.375,72.06477732793522,27.5,72.06477732793522,27.5C72.06477732793522,27.5,80.76923076923077,13.5,80.76923076923077,13.5C80.76923076923077,13.5,85.22267206477733,13.5,85.22267206477733,13.5C85.22267206477733,13.5,82.5910931174089,16.875,82.5910931174089,16.875C82.5910931174089,16.875,79.55465587044534,22.125,79.55465587044534,22.125C79.55465587044534,22.125,75.91093117408907,26.875,75.91093117408907,26.875C75.91093117408907,26.875,76.3157894736842,30,76.3157894736842,30C76.3157894736842,30,76.3157894736842,33.125,76.3157894736842,33.125C76.3157894736842,33.125,74.2914979757085,35.375,74.2914979757085,35.375C74.2914979757085,35.375,69.4331983805668,37.375,69.4331983805668,37.375C69.4331983805668,37.375,65.1821862348178,40.125,65.1821862348178,40.125C65.1821862348178,40.125,54.453441295546554,41.375,54.453441295546554,41.375C54.453441295546554,41.375,44.534412955465584,40.5,44.534412955465584,40.5C44.534412955465584,40.5,34.61538461538461,37.375,34.61538461538461,37.375C34.61538461538461,37.375,29.757085020242915,33.625,29.757085020242915,33.625C29.757085020242915,33.625,27.327935222672064,29.5,27.327935222672064,29.5C27.327935222672064,29.5,26.720647773279353,23.625,26.720647773279353,23.625Z",
+			"state": 1,
+			"created": "2016-03-25 14:13:44.913765+01"
+	    }
+	}
+	
+]
\ No newline at end of file