Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www

Conflicts:
	.gitignore
	app/bin/app.sh

diff --cc .gitignore
index 93312a9cd173224d76e13ce3fa17dc047a24d6e1,d169a56c10e17933223181e3496697a7c1971861..574644269d3967b49e6b49e46f4b5775e2a2a0e5
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -15,7 -15,7 +15,8 @@@ develop-egg
  .thumbnails
  .tmp
  *.lock
 +var
+ .init
  
  # Installer logs
  pip-log.txt

diff --cc app/bin/init.sh
index 0000000000000000000000000000000000000000,f8d1abb81b09c7338d63719ee48c5341239cf817..3b092d605c394a26b57934308f58f17d845748ea
mode 000000,100755..100755
--- /dev/null
--- 2/app/bin/init.sh
+++ b/app/bin/init.sh
@@@ -1,0 -1,12 +1,13 @@@
+ #!/bin/bash
+ 
+ # paths
+ app='/srv/app'
+ manage=$app'/manage.py'
+ 
+ python $manage migrate --noinput
+ python $manage create-admin-user
++python $manage create-default-organization
+ 
+ # @todo searching every fixtures file in each folder
+ python $manage loaddata $app/organization/job/fixtures/organization-job.json
+ python $manage loaddata $app/organization/projects/fixtures/organization-projects-repositorysystems.json

diff --cc app/local_settings.py
Simple merge