Merge branch 'master' of ssh://etienne@daenerys.peacefrogs.net/var/local/git/chimere

90 files changed, 1140 insertions, 1347 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 6eccf6c..47e6443 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1 +1,24 @@
-2.0,  2012-01-02 -- First release for the second version.
+2.0.1 (2013-02-10)
+------------------
+
+- admin: fix route page when a property is newly set
+- map: add attribution div
+- minor fix on the documentation
+
+
+2.0.0 (2013-02-02)
+------------------
+
+- improve documentation
+- add a default description for imports
+- minor fix on styles
+- remove the default application to an external repository https://gitorious.org/chimere-example-project/
+- fix upgrade issues
+- small improvements for default templates
+- fix zoom on the map for route's permalinks
+
+2.0 (2013-01-02)
+----------------
+
+- First release for the second version.
+
diff --git a/DATA_LICENCES.txt b/DATA_LICENCES.txt
new file mode 100644
index 0000000..c9532bc
--- /dev/null
+++ b/DATA_LICENCES.txt
@@ -0,0 +1 @@
+chimere/tests/eqs7day-M5.xml is a georss feed from the website http://www.usgs.gov/ published under the US public domain
diff --git a/MANIFEST.in b/MANIFEST.in
index 565fbbc..7b2ddd9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,7 @@
 include *.txt MANIFEST.in
 include chimere/tests/*
-prune docs/*/build/
-prune example_project/local_settings.py
-include example_project/*.sample
-include docs/*/*.rst Makefile
+prune docs/*/*/build/
+include docs/*/*.rst
 include docs/*/Makefile
 include docs/*/conf.py
 include docs/*/static/*.png
diff --git a/README.txt b/README.txt
index 603837a..3cbfe1e 100644
--- a/README.txt
+++ b/README.txt
@@ -36,6 +36,8 @@ External libs
 =============
 
 To be fully functional, this package is provided with external libs:
- - `OsmApi <http://wiki.openstreetmap.org/wiki/PythonOsmApi>`_ - GPL v3.
- - `prettyPhoto <http://www.no-margin-for-errors.com/projects/prettyphoto-jquery-lightbox-clone/>`_ - GPL v2.
- - `jMediaelement <https://github.com/aFarkas/jMediaelement>`_ - GPL v2.
+ - `OpenLayers <http://openlayers.org/>`_ - 2006-2012 OpenLayers Contributors - 2-clause BSD
+ - `OsmApi <http://wiki.openstreetmap.org/wiki/PythonOsmApi>`_ - 2009-2010 Étienne Chové - GPL v3.
+ - `prettyPhoto <http://www.no-margin-for-errors.com/projects/prettyphoto-jquery-lightbox-clone/>`_ - 2012 Stephane Caron - GPL v2.
+ - `jMediaelement <https://github.com/aFarkas/jMediaelement>`_ - 2010 Alexander Farkas - GPL v2 and MIT.
+ - `bsmSelect <https://github.com/vicb/bsmSelect/>`_ - 2010 Victor Berchet - GPL v2 and MIT.
diff --git a/chimere/__init__.py b/chimere/__init__.py
index e8e07a3..450d4e5 100644
--- a/chimere/__init__.py
+++ b/chimere/__init__.py
@@ -1,22 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
-"""
-import os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings'
+# Copyright (C) 2012-2013  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
-from django.utils.translation import ugettext as _
-
-try:
-    # strings to be considered for translation
-    # templates/chimere/edit.html, templates/chimere/edit_route.html
-    _(u"Multimedia files")
-    _(u"Picture files")
-except ImportError:
-    pass
-"""
-
-VERSION = (2, 0)
+VERSION = (2, 0, 1)
 
 def get_version():
     return u'.'.join((unicode(num) for num in VERSION))
diff --git a/chimere/admin.py b/chimere/admin.py
index 4b83878..996dfd5 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -210,17 +210,19 @@ class MarkerAdmin(admin.ModelAdmin):
                  }),
                 )
     inlines = [MultimediaInline, PictureInline]
+    has_properties = True
 
     def __init__(self, *args, **kwargs):
         """
         Manage properties in fieldsets.
         """
-        main_fields = self.fieldsets[0][1]['fields']
-        for pm in PropertyModel.objects.filter(available=True).order_by('order'
+        if self.has_properties:
+            main_fields = self.fieldsets[0][1]['fields']
+            for pm in PropertyModel.objects.filter(available=True).order_by('order'
                                                ).all():
-            pm_name = pm.getNamedId()
-            if pm_name not in main_fields:
-                main_fields.append(pm_name)
+                pm_name = pm.getNamedId()
+                if pm_name not in main_fields:
+                    main_fields.append(pm_name)
         super(MarkerAdmin, self).__init__(*args, **kwargs)
 
     def queryset(self, request):
@@ -286,6 +288,7 @@ class RouteAdmin(MarkerAdmin):
                  }),
                 )
     inlines = []
+    has_properties = False
 
     def queryset(self, request):
         qs = self.model._default_manager.get_query_set()
diff --git a/chimere/default_settings.py b/chimere/default_settings.py
deleted file mode 100644
index 049520f..0000000
--- a/chimere/default_settings.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Here are the default settings for the Chimere app.
-Feel free to set these settings in your project, they will override these defaults.
-"""
-# The height and width of the POI icons
-CHIMERE_ICON_HEIGHT = 20
-CHIMERE_ICON_WIDTH = 20
-# The offset of the POI icons
-CHIMERE_ICON_OFFSET_X = 0
-CHIMERE_ICON_OFFSET_Y = 0
-
-# default center of the map
-CHIMERE_DEFAULT_CENTER = (2.49, 48.7)
-# Default zoom level
-CHIMERE_DEFAULT_ZOOM = 10
-# projection used by the main map
-# most public map providers use spherical mercator : 900913
-CHIMERE_EPSG_PROJECTION = 900913
-# projection displayed to the end user by openlayers
-# chimere use the same projection to save its data in the database
-CHIMERE_EPSG_DISPLAY_PROJECTION = 4326
-# display of shortcuts for areas
-CHIMERE_DISPLAY_AREAS = True
-# number of day before an event to display
-# if equal to 0: disable event management
-# if you change this value from 0 to a value in a production environnement
-# don't forget to run the upgrade.py script to create appropriate fields in
-# the database
-CHIMERE_DAYS_BEFORE_EVENT = 30
-
-# JS definition of the main map cf. OpenLayers documentation for more details
-CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" # OSM mapnik map
-
-# display picture inside the description by default or inside a galery?
-CHIMERE_MINIATURE_BY_DEFAULT = True
diff --git a/chimere/static/bsmSelect/GPL-LICENSE.txt b/chimere/static/bsmSelect/GPL-LICENSE.txt
new file mode 100644
index 0000000..76927f5
--- /dev/null
+++ b/chimere/static/bsmSelect/GPL-LICENSE.txt
@@ -0,0 +1,278 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
\ No newline at end of file
diff --git a/chimere/static/bsmSelect/MIT-LICENSE.txt b/chimere/static/bsmSelect/MIT-LICENSE.txt
new file mode 100644
index 0000000..908016b
--- /dev/null
+++ b/chimere/static/bsmSelect/MIT-LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright (c) 2008 by Ryan Cramer, http://www.ryancramer.com
+Copyright (c) 2010 by Victor Berchet
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/chimere/static/bsmSelect/README.md b/chimere/static/bsmSelect/README.md
new file mode 100644
index 0000000..bd14c6a
--- /dev/null
+++ b/chimere/static/bsmSelect/README.md
@@ -0,0 +1,191 @@
+# bsmSelect - Better Select Multiple #
+
+based on asmSelect - Alternate Select Multiple by Ryan Cramer
+
+  * [Google code project](http://code.google.com/p/jquery-asmselect/)
+  * [Github page](http://github.com/ryancramerdesign/jquery-asmSelect)
+  * [Ryan's article about asmSelect](http://www.ryancramer.com/journal/entries/select_multiple/)
+  * the original README can be found in the project root folder
+
+## Demo ##
+
+[bsmSelect demo](http://www.suumit.com/projects/bsmSelect/examples/index.html)
+
+## Usage ##
+
+Include jquery, bsmSelect, and css in document head:
+
+    <script type="text/javascript" src="jquery.js"></script>
+    <script type="text/javascript" src="jquery.bsmselect.js"></script>
+    <link rel="stylesheet" type="text/css" href="jquery.bsmselect.css" />
+
+Use a jQuery selector in your document ready function:
+
+    jQuery(function($) {
+        $("select[multiple]").bsmSelect();
+    });
+
+If desired, you can specify options when you call the plugin:
+
+    jQuery(function($) {
+        $("select[multiple]").bsmSelect({
+            addItemTarget: 'top'
+        });
+    });
+
+The newly created select default option is the original select title attribute:
+
+    <select name="cities" multiple="multiple" title="Please select a city">
+    ...
+    </select>
+
+## Requirements ##
+
+* jQuery 1.4+ (you might need a newer version for IE9 compatibility)
+
+## Options ##
+
+### Primary Options ###
+
+* listType:
+
+  * Specify what list will be created or used as part of the bsmSelect.
+  * Can accept a callback that accepts the original <select> as an argument and returns a jQuery object with a single list.
+  * Allowed values:
+      * 'ol'
+      * 'ul'
+      * function(originalSelect) { // your code; return $('&lt;ul&gt;'); }
+  * Default: 'ol'
+
+* highlightEffect:
+
+  * Show a quick highlight of what item was added or removed?
+  * Allowed values:
+    * an animation function
+  * Default: $.noop (no effect)
+
+* showEffect:
+
+  * Animate the addition of an item to the list
+  * Allowed values:
+    * an animation function
+  * Default: $.bsmSelect.effects.show
+
+* hideEffect:
+
+  * Animate the removal of an items from the list
+  * Allowed values:
+    * an animation function
+  * Default: $.bsmSelect.effects.remove
+
+* hideWhenAdded:
+
+  * Stop showing in select after item has been added?
+  * Allowed values: true or false
+  * Default: false
+  * Note: Only functional in Firefox 3 at this time.
+
+* addItemTarget:
+
+  * Where to place new selected items that are added to the list.
+  * Allowed values: 'top' or 'bottom' or 'original' to keep the original select sort order
+  * Default: 'bottom'
+  * Note: When using the 'original' mode, the sort order can be overriden by setting the 'bsm-order' data on each option.
+
+* debugMode:
+
+  * Keeps original select multiple visible so that you can monitor live changes made to it when debugging.
+  * Default: false
+
+* extractLabel:
+
+  * A function to compute the list element name from the option object
+  * Default: extract the option html
+
+* plugins
+
+  * An array of plugins objects to enable (they only are required to have an `init` method which is called on init with the Bsmselect instance as single argument).
+  * Default: an empty array (no plugin enabled by default)
+
+### Text Labels ###
+
+* title
+
+  * Text used for the default select label (when original select title attribute is not set)
+  * Default: 'Select...'
+
+* removeLabel:
+
+  * Text used for the remove link of each list item.
+  * Default: 'remove'
+
+* highlightAddedLabel:
+
+  * Text that precedes highlight of item added.
+  * Default: 'Added: '
+
+* highlightRemovedLabel:
+
+  * Text that precedes highlight of item removed.
+  * Default: 'Removed: '
+
+### Modifiable CSS Classes ###
+
+* containerClass:
+
+  * Class for container that wraps the entire bsmSelect.
+  * Default: 'bsmContainer'
+
+* selectClass:
+
+  * Class for the newly created <select>.
+  * Default: 'bsmSelect'
+
+* listClass:
+
+  * Class for the newly created list of listType (ol or ul).
+  * Default: 'bsmList'
+
+* listSortableClass:
+
+  * Another class given to the list when sortable is active.
+  * Default: 'bsmListSortable'
+
+* listItemClass:
+
+  * Class given to the <li> list items.
+  * Default: 'bsmListItem'
+
+* listItemLabelClass:
+
+  * Class for the label text that appears in list items.
+  * Default: 'bsmListItemLabel'
+
+* removeClass:
+
+  * Class given to the remove link in each list item.
+  * Any element found in the <li> with this class will remove it.
+  * If you give the <li> this class, clicking anywhere on the <li> will remove it.
+  * Default: 'bsmListItemRemove'
+
+* highlightClass:
+
+  * Class given to the highlight <span>.
+  * Default: 'bsmHighlight'
+
+## Authors and contributors ##
+
+  * [Ryan Cramer](http://www.ryancramer.com/) is the author of the original asmSelect
+  * [Victor Berchet](http://github.com/vicb) is the author of bsmSelect
+  * [Andy Fowler](http://github.com/andyfowler) has contributed many enhancements
+  * [Cracky](https://github.com/Cracky)
+  * [Marc Busqué](https://github.com/laMarciana) has contributed to fix [issue #21](https://github.com/vicb/bsmSelect/issues/21) and with minimal CSS
+
+## History ##
+
+see [history.md](history.md).
+
+## Related Projects ##
+
+  * [Chosen](https://github.com/harvesthq/chosen/)
+
diff --git a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css b/chimere/static/bsmSelect/css/jquery.bsmselect.css
index ad770d0..ad770d0 100644
--- a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css
+++ b/chimere/static/bsmSelect/css/jquery.bsmselect.css
diff --git a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css b/chimere/static/bsmSelect/css/jquery.bsmselect.custom.css
index 8c48aeb..8c48aeb 100644
--- a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css
+++ b/chimere/static/bsmSelect/css/jquery.bsmselect.custom.css
diff --git a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js b/chimere/static/bsmSelect/js/jquery.bsmselect.compatibility.js
index a743a07..a743a07 100644
--- a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js
+++ b/chimere/static/bsmSelect/js/jquery.bsmselect.compatibility.js
diff --git a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js b/chimere/static/bsmSelect/js/jquery.bsmselect.js
index 25527c6..25527c6 100644
--- a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js
+++ b/chimere/static/bsmSelect/js/jquery.bsmselect.js
diff --git a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.sortable.js b/chimere/static/bsmSelect/js/jquery.bsmselect.sortable.js
index 3e4b9f8..3e4b9f8 100644
--- a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.sortable.js
+++ b/chimere/static/bsmSelect/js/jquery.bsmselect.sortable.js
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 88f1b5e..c30d259 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -879,3 +879,8 @@ div.pp_default .pp_expand{
   left:10px;
   background-position: -15px -80px;
 }
+
+.olControlAttribution{
+    left:6px;
+    bottom:5px;
+}
diff --git a/chimere/static/chimere/img/cloud-popup-relative.png b/chimere/static/chimere/img/cloud-popup-relative.png
index 1215a36..1215a36 100755..100644
--- a/chimere/static/chimere/img/cloud-popup-relative.png
+++ b/chimere/static/chimere/img/cloud-popup-relative.png
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 3168c24..dbf820c 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -61,6 +61,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             dynamic_categories: false,
             display_submited: false,
             display_feature: null,
+            display_route: null,
             area_id: null,
             checked_categories: [],
             zoom: null,
@@ -122,6 +123,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             /* Create map object */
             settings.map = map = new OpenLayers.Map(map_element, map_options);
 
+            map.addControl(new OpenLayers.Control.Attribution());
+
             /* Manage permalink */
             if (!settings.edition){
                 if (settings.permalink == null && !settings.edition) {
@@ -433,8 +436,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             if (settings.display_feature == feature.pk){
                 _popup(feature);
                 methods.display_feature_detail(feature.pk);
-                settings.map.setCenter(feature.lonlat, 16);
-                methods.loadCategories();
+                if (!settings.display_route){
+                    settings.map.setCenter(feature.lonlat, 16);
+                    methods.loadCategories();
+                }
             }
             return feature;
         },
@@ -461,6 +466,11 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, {
             settings.current_feature.style = style;
             settings.current_feature.geometry = linestring;
             settings.layerVectors.addFeatures([settings.current_feature]);
+            if (settings.display_route && settings.display_route == route.properties.pk){
+                var dataExtent = settings.current_feature.geometry.getBounds();
+                map.zoomToExtent(dataExtent, closest=true);
+                methods.loadCategories();
+            }
         },
         display_feature_detail: function (pk) {
             /*
diff --git a/chimere/static/jme/GPL-LICENSE-2.txt b/chimere/static/jme/GPL-LICENSE-2.txt
new file mode 100644
index 0000000..3c993fd
--- /dev/null
+++ b/chimere/static/jme/GPL-LICENSE-2.txt
@@ -0,0 +1,278 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+ 
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+ 
+          Preamble
+ 
+  The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+ 
+  When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+ 
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+ 
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+ 
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+ 
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+ 
+  Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+ 
+  The precise terms and conditions for copying, distribution and
+modification follow.
+ 
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+ 
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+ 
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+ 
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+ 
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+ 
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+ 
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+ 
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License. (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+ 
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+ 
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+ 
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+ 
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+ 
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+ 
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+ 
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code. (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+ 
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+ 
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+ 
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+ 
+  5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+ 
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+ 
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+ 
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+ 
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+ 
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+ 
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+ 
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+ 
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+ 
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+ 
+          NO WARRANTY
+ 
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+ 
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
\ No newline at end of file
diff --git a/chimere/static/jme/MIT-LICENSE.txt b/chimere/static/jme/MIT-LICENSE.txt
new file mode 100644
index 0000000..e197885
--- /dev/null
+++ b/chimere/static/jme/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2010 Alexander Farkas, http://protofunc.com/
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/chimere/static/chimere/js/OpenLayers.js b/chimere/static/openlayers/OpenLayers.js
index d94ff5b..d94ff5b 100644
--- a/chimere/static/chimere/js/OpenLayers.js
+++ b/chimere/static/openlayers/OpenLayers.js
diff --git a/chimere/static/chimere/js/SimplePanZoom.js b/chimere/static/openlayers/SimplePanZoom.js
index 45619c3..45619c3 100644
--- a/chimere/static/chimere/js/SimplePanZoom.js
+++ b/chimere/static/openlayers/SimplePanZoom.js
diff --git a/chimere/static/prettyPhoto/README b/chimere/static/prettyPhoto/README
new file mode 100755
index 0000000..1e56842
--- /dev/null
+++ b/chimere/static/prettyPhoto/README
@@ -0,0 +1,30 @@
+prettyPhoto v3.1.4
+© Copyright, Stephane Caron
+http://www.no-margin-for-errors.com
+
+
+============================= Released under =============================
+
+Creative Commons 2.5
+http://creativecommons.org/licenses/by/2.5/
+
+OR
+
+GPLV2 license
+http://www.gnu.org/licenses/gpl-2.0.html
+
+You are free to use prettyPhoto in commercial projects as long as the
+copyright header is left intact.
+
+============================ More information ============================
+http://www.no-margin-for-errors.com/projects/prettyPhoto/
+
+
+============================== Description ===============================
+
+prettyPhoto is a jQuery based lightbox clone. Not only does it support images,
+it also add support for videos, flash, YouTube, iFrame. It's a full blown
+media modal box.
+
+Please refer to http://www.no-margin-for-errors.com/projects/prettyPhoto/
+for all the details on how to use. 
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png
index e5a047c..e5a047c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif
index 50820ee..50820ee 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png
index fb8c0f8..fb8c0f8 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png
index 7b50aff..7b50aff 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif
index 50820ee..50820ee 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png
index 4fe3547..4fe3547 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png
index e809c3b..e809c3b 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png
index 0812542..0812542 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png
index a9be3b2..a9be3b2 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png
index 277c87a..277c87a 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png
index 76e50d0..76e50d0 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png
index 8b110ba..8b110ba 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif
index 7ac990c..7ac990c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png
index 660a254..660a254 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif
index 7ac990c..7ac990c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png
index 7f28379..7f28379 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif
index 7ac990c..7ac990c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png
index 4fe3547..4fe3547 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png
diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html
index 886c50b..9788528 100644
--- a/chimere/templates/chimere/blocks/map.html
+++ b/chimere/templates/chimere/blocks/map.html
@@ -31,8 +31,9 @@
     chimere_init_options["checked_categories"] = {{ p_checked_categories }};
     {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %}
     {% if p_current_feature %}
-    chimere_init_options["display_feature"] = {{ p_current_feature }};
-    {% endif %}
+    chimere_init_options["display_feature"] = {{ p_current_feature }};{% endif %}
+    {% if p_current_route %}
+    chimere_init_options["display_route"] = {{ p_current_route }};{% endif %}
     {% if restricted_extent %}{{ restricted_extent }}
     chimere_init_options["restricted_extent"] = bounds;
     {% endif %}
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index 0182b66..0490c2d 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -185,6 +185,7 @@ bounds.extend(new OpenLayers.LonLat(%f, %f));
         return context_data
     request = context['request']
     # Default values
+    context_data['p_current_route'] = context.get('current_route')
     if request.GET:
         for key in ('zoom', 'lon', 'lat', 'display_submited',
                     'current_feature'):
diff --git a/chimere/tests/data_license b/chimere/tests/data_license
deleted file mode 100644
index bee3231..0000000
--- a/chimere/tests/data_license
+++ /dev/null
@@ -1 +0,0 @@
-eqs7day-M5.xml is a georss feed from the website http://www.usgs.gov/ published under the US public domain
diff --git a/chimere/utils.py b/chimere/utils.py
index d1ea851..a82d88b 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -46,6 +46,8 @@ from chimere import get_version
 from external_utils import OsmApi
 
 def unicode_normalize(string):
+    if type(string) == str:
+        string = unicode(string.decode('utf-8'))
     return ''.join(
         (c for c in unicodedata.normalize('NFD', string)
         if unicodedata.category(c) != 'Mn'))
diff --git a/chimere/views.py b/chimere/views.py
index b49da6e..22bd50a 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -123,6 +123,13 @@ def index(request, area_name=None, default_area=None, simple=False):
     if request.GET and 'lat' in request.GET \
       and 'lon' in request.GET:
         zoomout = None
+    if request.GET and 'current_feature' in request.GET:
+        try:
+            m = Marker.objects.get(pk=request.GET['current_feature'])
+            if m.route:
+                response_dct['current_route'] = m.route.pk
+        except:
+            pass
     response_dct.update({
          'actions':actions, 'action_selected':('view',),
          'error_message':'',
diff --git a/chimere/widgets.py b/chimere/widgets.py
index 4cccf32..b60a661 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -576,13 +576,13 @@ class AreaField(forms.MultiValueField):
 class MultiSelectWidget(forms.SelectMultiple):
     class Media:
         css = {'all': list(settings.JQUERY_CSS_URLS) + [
-            settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css',
-            settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css',
+            settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.css',
+            settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.custom.css',
             ]
         }
         js = list(settings.JQUERY_JS_URLS) + [
-            settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js',
-            settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js',
+            settings.STATIC_URL + 'bsmSelect/js/jquery.bsmselect.js',
+            settings.STATIC_URL + 'bsmSelect/js/jquery.bsmselect.compatibility.js',
             ]
 
     def render(self, name, value, attrs=None):
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..790575e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,11 @@
+python-django-chimere (2.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Étienne Loks <etienne.loks@peacefrogs.net>  Sun, 10 Feb 2013 17:01:34 +0100
+
+python-django-chimere (2.0.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #699579)
+
+ -- Étienne Loks <etienne.loks@peacefrogs.net>  Sat, 02 Feb 2013 00:51:40 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
index 1d89b61..71b2461 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,56 @@
+Source: python-django-chimere
+Section: python
+Priority: optional
+Maintainer: Étienne Loks <etienne.loks@peacefrogs.net>
+Build-Depends: debhelper (>= 8.0.0),
+ python | python-all | python-dev | python-all-dev,
+ python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
+ python-setuptools
+Standards-Version: 3.9.3
+Homepage: http://pypi.python.org/pypi/chimere
+#Vcs-Git: git://git.debian.org/collab-maint/python-django-chimere.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/python-django-chimere.git;a=summary
+
 Package: python-django-chimere
-Version: 2.0
-Depends: python-django (>=1.4), python-gdal, python-psycopg2,
-         python-beautifulsoup, python-imaging, libjs-jquery,
-         libjs-jquery-ui, libjs-jquery-ui-theme-base,
-         postgresql-9.1, postgresql-9.1-postgis, gettext,
-         python-simplejson, gpsbabel, python-django-south,
-         python-pyexiv2 python-feedparser javascript-common
-Recommends: tinymce, python-django-celery, python-kombu
-Suggests: libjs-jquery-ui-theme-south-street
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ python-django (>= 1.4),
+ python-django (<< 1.5),
+ python-gdal,
+ python-psycopg2,
+ python-beautifulsoup,
+ python-imaging,
+ python-simplejson,
+ python-django-south,
+ python-pyexiv2,
+ python-feedparser
+Recommends: javascript-common,
+ libjs-jquery,
+ libjs-jquery-ui,
+ libjs-jquery-ui-theme-base,
+ gpsbabel
+Description: collaborative and thematic maps application for Django
+ Chimère is a cartographic mashup using OpenStreetMap as a default map
+ layer. This software aims to create online collaborative and thematic
+ maps. Content (multimedia, text) are associated to basic geographic
+ items (Point Of Interest, routes). Adds on the map are open to everybody
+ with no authentication but are moderated by a team in charge of the map.
+ .
+ Main features:
+  * Display (by default) of the mapnik OpenStreetMap layer.
+  * Display on the map of POIs (with markers) and routes (with colored
+    polylines).
+  * Thematic choices of items to display (POIs and routes).
+  * Filter themes in regard to currently available items.
+  * Display of the detail of a POI (name, description, pictures, multimedia
+    files).
+  * Management of multimedia files and images associated to POIs.
+  * Add of a cartographic item (POI, route) on the map by an user without
+    authentication (the item is only available after moderation).
+  * Admin interface for moderation and configuration.
+  * Cut a Chimère by "areas". Each "area" can have specific themes, a new
+    default center, etc.
+  * Configuration of map layers in administration interface.
+  * Import and export of data from/to various formats: ShapeFile, KML, GeoRSS
+    (import only), CSV and OpenStreetMap.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..bee08dd
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,113 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: chimere
+Source: http://pypi.python.org/pypi/chimere
+
+Files: *
+Copyright: 2013 Étienne Loks <etienne.loks@peacefrogs.net>
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2013 Étienne Loks <etienne.loks@peacefrogs.net>
+License: GPL-3.0+
+
+Files: chimere/external_utils/OsmApi.py
+Copyright: 2009-2010 Étienne Chové <chove@crans.org>
+License: GPL-3.0+
+
+Files: chimere/jme/*
+Copyright: 2010 Alexander Farkas <info@corrupt-system.de>
+License: MIT or GPL-2
+
+Files: chimere/bsmSelect/*
+Copyright: 2008 Ryan Cramer
+           2010 Victor Berchet
+License: MIT or GPL-2
+
+Files: chimere/prettyPhoto/*
+Copyright: 2012 Stephane Caron
+License: GPL-2
+
+Files: chimere/openlayers/*
+Copyright: 2006-2012 OpenLayers Contributors
+License: BSD-2-clause
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full license can be found at
+ "/usr/share/common-licenses/GPL-2".
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY OPENLAYERS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ The views and conclusions contained in the software and documentation are those
+ of the authors and should not be interpreted as representing official policies,
+ either expressed or implied, of OpenLayers Contributors.
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000..b7c033a
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,10 @@
+Document: python-django-chimere
+Title: Chimère
+Author: Étienne Loks
+Abstract: This manual describes how to install and use Chimère a web
+ collaborative and thematic maps.
+Section: Data Management
+
+Format: html
+Index: /usr/share/doc/python-django-chimere/html/index.html
+Files: /usr/share/doc/python-django-chimere/html/*.html
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e953f2c
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+CHANGES.txt
+README.txt
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..0d69808
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,2 @@
+django_tinymce tinymce
+pil python-imaging
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..5d9478f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+PYTHON2=$(shell pyversions -vr)
+
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.9.1:9
+
+%:
+	dh $@ --with python2,sphinxdoc
+
+override_dh_installdocs:
+	python setup.py build_sphinx --source-dir=docs/en/
+	dh_installdocs build/sphinx/html
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+	rm -rf *.egg-info
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a67dad8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/c/chimere-([0-9a-z.]*)\.tar\.gz
diff --git a/docs/en/install.rst b/docs/en/install.rst
index ff8ac46..1bb5771 100644
--- a/docs/en/install.rst
+++ b/docs/en/install.rst
@@ -141,11 +141,14 @@ Another solution is to get it from the Git repository::
 Creating a custom project template
 **********************************
 
-There, a default project is provided (*example_project*). Copy and modify 
-it (or get another project based on Chimère)::
+A default project can be found on `Gitorious
+<https://gitorious.org/chimere-example-project/chimere-example-project>`_. Get
+it and start a new project with it (or get another project based on Chimère)::
 
     cd $INSTALL_PATH/chimere
-    cp -ra example_project mychimere_project
+    git clone git://gitorious.org/chimere-example-project/chimere-example-project.git
+    django-admin startproject --template=chimere-example-project mychimere_project
+    rm -rf chimere-example-project
 
 Your project name is used for the name of the Python package of your template.
 As a Python package it should follow the rule of Python variable name:
diff --git a/docs/en/upgrade.rst b/docs/en/upgrade.rst
index 6dce286..d0eaa4c 100644
--- a/docs/en/upgrade.rst
+++ b/docs/en/upgrade.rst
@@ -146,13 +146,16 @@ Version 1.2 -> 2.0
 
 Project template
 ................
-Create a new project template:
+A default project can be found on `Gitorious
+<https://gitorious.org/chimere-example-project/chimere-example-project>`_. Get
+it and start a new project with it (or get another project based on Chimère)::
 
 .. code-block:: bash
 
     cd $CHIMERE_PATH
-    cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME
-    CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
+    git clone git://gitorious.org/chimere-example-project/chimere-example-project.git
+    django-admin startproject --template=chimere-example-project mychimere_project
+    rm -rf chimere-example-project
 
 local_settings
 ..............
diff --git a/docs/fr/install.rst b/docs/fr/install.rst
index 9a33e7c..8e8f8ce 100644
--- a/docs/fr/install.rst
+++ b/docs/fr/install.rst
@@ -138,11 +138,14 @@ Une autre solution est d'obtenir les sources depuis le dépôt Git : ::
 Créez un patron pour votre projet
 *********************************
 
-Il y a un exemple de projet fourni (*example_project*). Copiez-le et 
-modifiez-le (ou utilisez un autre projet basé sur Chimère) : ::
+Un exemple de projet peut être trouvé sur `Gitorious
+<https://gitorious.org/chimere-example-project/chimere-example-project>`_.
+Clonez-le et modifiez-le (ou utilisez un autre projet basé sur Chimère) : ::
 
     cd $INSTALL_PATH/chimere
-    cp -ra example_project mychimere_project
+    git clone git://gitorious.org/chimere-example-project/chimere-example-project.git
+    django-admin startproject --template=chimere-example-project mychimere_project
+    rm -rf chimere-example-project
 
 Le nom de votre projet est utilisé pour le nom de la bibliothèque Python
 correspondant à votre projet.
diff --git a/docs/fr/upgrade.rst b/docs/fr/upgrade.rst
index 32d37b8..841485b 100644
--- a/docs/fr/upgrade.rst
+++ b/docs/fr/upgrade.rst
@@ -154,13 +154,16 @@ Version 1.2 -> 2.0
 
 Patron de projet
 ................
-Créez un nouveau patron de projet :
+Un exemple de projet peut être trouvé sur `Gitorious
+<https://gitorious.org/chimere-example-project/chimere-example-project>`_.
+Clonez-le et modifiez-le (ou utilisez un autre projet basé sur Chimère) : ::
 
 .. code-block:: bash
 
     cd $CHIMERE_PATH
-    cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME
-    CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
+    git clone git://gitorious.org/chimere-example-project/chimere-example-project.git
+    django-admin startproject --template=chimere-example-project mychimere_project
+    rm -rf chimere-example-project
 
 local_settings
 ..............
diff --git a/example_project/__init__.py b/example_project/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/example_project/__init__.py
+++ /dev/null
diff --git a/example_project/fixtures/first_data.json b/example_project/fixtures/first_data.json
deleted file mode 100644
index 814e8e0..0000000
--- a/example_project/fixtures/first_data.json
+++ /dev/null
@@ -1,853 +0,0 @@
-[
-    {
-        "pk": 20, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "area", 
-            "name": "Area", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 14, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "category", 
-            "name": "Category", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 13, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "color", 
-            "name": "Color", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 12, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "colortheme", 
-            "name": "Color theme", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 6, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "contenttype", 
-            "name": "content type", 
-            "app_label": "contenttypes"
-        }
-    }, 
-    {
-        "pk": 2, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "group", 
-            "name": "group", 
-            "app_label": "auth"
-        }
-    }, 
-    {
-        "pk": 15, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "icon", 
-            "name": "Icon", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 5, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "logentry", 
-            "name": "log entry", 
-            "app_label": "admin"
-        }
-    }, 
-    {
-        "pk": 4, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "message", 
-            "name": "message", 
-            "app_label": "auth"
-        }
-    }, 
-    {
-        "pk": 9, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "migrationhistory", 
-            "name": "migration history", 
-            "app_label": "south"
-        }
-    }, 
-    {
-        "pk": 10, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "news", 
-            "name": "News", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 1, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "permission", 
-            "name": "permission", 
-            "app_label": "auth"
-        }
-    }, 
-    {
-        "pk": 17, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "marker", 
-            "name": "Point of interest", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 22, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "property", 
-            "name": "Property", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 21, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "propertymodel", 
-            "name": "Property model", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 19, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "route", 
-            "name": "Route", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 18, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "routefile", 
-            "name": "Route file", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 7, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "session", 
-            "name": "session", 
-            "app_label": "sessions"
-        }
-    }, 
-    {
-        "pk": 8, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "site", 
-            "name": "site", 
-            "app_label": "sites"
-        }
-    }, 
-    {
-        "pk": 16, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "subcategory", 
-            "name": "Subcategory", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 11, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "tinyurl", 
-            "name": "TinyUrl", 
-            "app_label": "chimere"
-        }
-    }, 
-    {
-        "pk": 3, 
-        "model": "contenttypes.contenttype", 
-        "fields": {
-            "model": "user", 
-            "name": "user", 
-            "app_label": "auth"
-        }
-    },  
-    {
-        "pk": 1, 
-        "model": "sites.site", 
-        "fields": {
-            "domain": "example.com", 
-            "name": "example.com"
-        }
-    }, 
-    {
-        "pk": 13, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_logentry", 
-            "name": "Can add log entry", 
-            "content_type": 5
-        }
-    }, 
-    {
-        "pk": 14, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_logentry", 
-            "name": "Can change log entry", 
-            "content_type": 5
-        }
-    }, 
-    {
-        "pk": 15, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_logentry", 
-            "name": "Can delete log entry", 
-            "content_type": 5
-        }
-    }, 
-    {
-        "pk": 4, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_group", 
-            "name": "Can add group", 
-            "content_type": 2
-        }
-    }, 
-    {
-        "pk": 5, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_group", 
-            "name": "Can change group", 
-            "content_type": 2
-        }
-    }, 
-    {
-        "pk": 6, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_group", 
-            "name": "Can delete group", 
-            "content_type": 2
-        }
-    }, 
-    {
-        "pk": 10, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_message", 
-            "name": "Can add message", 
-            "content_type": 4
-        }
-    }, 
-    {
-        "pk": 11, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_message", 
-            "name": "Can change message", 
-            "content_type": 4
-        }
-    }, 
-    {
-        "pk": 12, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_message", 
-            "name": "Can delete message", 
-            "content_type": 4
-        }
-    }, 
-    {
-        "pk": 1, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_permission", 
-            "name": "Can add permission", 
-            "content_type": 1
-        }
-    }, 
-    {
-        "pk": 2, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_permission", 
-            "name": "Can change permission", 
-            "content_type": 1
-        }
-    }, 
-    {
-        "pk": 3, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_permission", 
-            "name": "Can delete permission", 
-            "content_type": 1
-        }
-    }, 
-    {
-        "pk": 7, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_user", 
-            "name": "Can add user", 
-            "content_type": 3
-        }
-    }, 
-    {
-        "pk": 8, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_user", 
-            "name": "Can change user", 
-            "content_type": 3
-        }
-    }, 
-    {
-        "pk": 9, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_user", 
-            "name": "Can delete user", 
-            "content_type": 3
-        }
-    }, 
-    {
-        "pk": 58, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_area", 
-            "name": "Can add Area", 
-            "content_type": 20
-        }
-    }, 
-    {
-        "pk": 59, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_area", 
-            "name": "Can change Area", 
-            "content_type": 20
-        }
-    }, 
-    {
-        "pk": 60, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_area", 
-            "name": "Can delete Area", 
-            "content_type": 20
-        }
-    }, 
-    {
-        "pk": 40, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_route", 
-            "name": "Can add Route", 
-            "content_type": 14
-        }
-    }, 
-    {
-        "pk": 41, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_route", 
-            "name": "Can change Route", 
-            "content_type": 14
-        }
-    }, 
-    {
-        "pk": 42, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_route", 
-            "name": "Can delete Route", 
-            "content_type": 14
-        }
-    }, 
-    {
-        "pk": 37, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_marker", 
-            "name": "Can add Point of interest", 
-            "content_type": 13
-        }
-    }, 
-    {
-        "pk": 38, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_marker", 
-            "name": "Can change Point of interest", 
-            "content_type": 13
-        }
-    }, 
-    {
-        "pk": 39, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_marker", 
-            "name": "Can delete Point of interest", 
-            "content_type": 13
-        }
-    }, 
-    {
-        "pk": 34, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_subcategory", 
-            "name": "Can add Subcategory", 
-            "content_type": 12
-        }
-    }, 
-    {
-        "pk": 35, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_subcategory", 
-            "name": "Can change Subcategory", 
-            "content_type": 12
-        }
-    }, 
-    {
-        "pk": 36, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_subcategory", 
-            "name": "Can delete Subcategory", 
-            "content_type": 12
-        }
-    }, 
-    {
-        "pk": 43, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_area", 
-            "name": "Can add Area", 
-            "content_type": 15
-        }
-    }, 
-    {
-        "pk": 44, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_area", 
-            "name": "Can change Area", 
-            "content_type": 15
-        }
-    }, 
-    {
-        "pk": 45, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_area", 
-            "name": "Can delete Area", 
-            "content_type": 15
-        }
-    }, 
-    {
-        "pk": 49, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_property", 
-            "name": "Can add Property", 
-            "content_type": 17
-        }
-    }, 
-    {
-        "pk": 50, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_property", 
-            "name": "Can change Property", 
-            "content_type": 17
-        }
-    }, 
-    {
-        "pk": 51, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_property", 
-            "name": "Can delete Property", 
-            "content_type": 17
-        }
-    }, 
-    {
-        "pk": 28, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_category", 
-            "name": "Can add Category", 
-            "content_type": 10
-        }
-    }, 
-    {
-        "pk": 29, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_category", 
-            "name": "Can change Category", 
-            "content_type": 10
-        }
-    }, 
-    {
-        "pk": 30, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_category", 
-            "name": "Can delete Category", 
-            "content_type": 10
-        }
-    }, 
-    {
-        "pk": 64, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_property", 
-            "name": "Can add Property", 
-            "content_type": 22
-        }
-    }, 
-    {
-        "pk": 65, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_property", 
-            "name": "Can change Property", 
-            "content_type": 22
-        }
-    }, 
-    {
-        "pk": 66, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_property", 
-            "name": "Can delete Property", 
-            "content_type": 22
-        }
-    }, 
-    {
-        "pk": 61, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_propertymodel", 
-            "name": "Can add Property model", 
-            "content_type": 21
-        }
-    }, 
-    {
-        "pk": 62, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_propertymodel", 
-            "name": "Can change Property model", 
-            "content_type": 21
-        }
-    }, 
-    {
-        "pk": 63, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_propertymodel", 
-            "name": "Can delete Property model", 
-            "content_type": 21
-        }
-    }, 
-    {
-        "pk": 55, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_route", 
-            "name": "Can add Route", 
-            "content_type": 19
-        }
-    }, 
-    {
-        "pk": 56, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_route", 
-            "name": "Can change Route", 
-            "content_type": 19
-        }
-    }, 
-    {
-        "pk": 57, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_route", 
-            "name": "Can delete Route", 
-            "content_type": 19
-        }
-    }, 
-    {
-        "pk": 52, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_routefile", 
-            "name": "Can add Route file", 
-            "content_type": 18
-        }
-    }, 
-    {
-        "pk": 53, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_routefile", 
-            "name": "Can change Route file", 
-            "content_type": 18
-        }
-    }, 
-    {
-        "pk": 54, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_routefile", 
-            "name": "Can delete Route file", 
-            "content_type": 18
-        }
-    }, 
-    {
-        "pk": 46, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_propertymodel", 
-            "name": "Can add Property model", 
-            "content_type": 16
-        }
-    }, 
-    {
-        "pk": 47, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_propertymodel", 
-            "name": "Can change Property model", 
-            "content_type": 16
-        }
-    }, 
-    {
-        "pk": 48, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_propertymodel", 
-            "name": "Can delete Property model", 
-            "content_type": 16
-        }
-    }, 
-    {
-        "pk": 31, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_icon", 
-            "name": "Can add Icon", 
-            "content_type": 11
-        }
-    }, 
-    {
-        "pk": 32, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_icon", 
-            "name": "Can change Icon", 
-            "content_type": 11
-        }
-    }, 
-    {
-        "pk": 33, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_icon", 
-            "name": "Can delete Icon", 
-            "content_type": 11
-        }
-    }, 
-    {
-        "pk": 16, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_contenttype", 
-            "name": "Can add content type", 
-            "content_type": 6
-        }
-    }, 
-    {
-        "pk": 17, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_contenttype", 
-            "name": "Can change content type", 
-            "content_type": 6
-        }
-    }, 
-    {
-        "pk": 18, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_contenttype", 
-            "name": "Can delete content type", 
-            "content_type": 6
-        }
-    }, 
-    {
-        "pk": 19, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_session", 
-            "name": "Can add session", 
-            "content_type": 7
-        }
-    }, 
-    {
-        "pk": 20, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_session", 
-            "name": "Can change session", 
-            "content_type": 7
-        }
-    }, 
-    {
-        "pk": 21, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_session", 
-            "name": "Can delete session", 
-            "content_type": 7
-        }
-    }, 
-    {
-        "pk": 22, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_site", 
-            "name": "Can add site", 
-            "content_type": 8
-        }
-    }, 
-    {
-        "pk": 23, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_site", 
-            "name": "Can change site", 
-            "content_type": 8
-        }
-    }, 
-    {
-        "pk": 24, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_site", 
-            "name": "Can delete site", 
-            "content_type": 8
-        }
-    }, 
-    {
-        "pk": 25, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "add_news", 
-            "name": "Can add News", 
-            "content_type": 9
-        }
-    }, 
-    {
-        "pk": 26, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "change_news", 
-            "name": "Can change News", 
-            "content_type": 9
-        }
-    }, 
-    {
-        "pk": 27, 
-        "model": "auth.permission", 
-        "fields": {
-            "codename": "delete_news", 
-            "name": "Can delete News", 
-            "content_type": 9
-        }
-    }, 
-    {
-        "pk": 1, 
-        "model": "auth.group", 
-        "fields": {
-            "name": "Moderator", 
-            "permissions": [
-                40, 
-                41, 
-                42, 
-                37, 
-                38, 
-                39, 
-                49, 
-                50, 
-                51
-            ]
-        }
-    }, 
-    {
-        "pk": 2, 
-        "model": "auth.group", 
-        "fields": {
-            "name": "Application administrator", 
-            "permissions": [
-                40, 
-                41, 
-                42, 
-                37, 
-                38, 
-                39, 
-                34, 
-                35, 
-                36, 
-                43, 
-                44, 
-                45, 
-                49, 
-                50, 
-                51, 
-                28, 
-                29, 
-                30, 
-                31, 
-                32, 
-                33, 
-                25, 
-                26, 
-                27
-            ]
-        }
-    }
-]
diff --git a/example_project/local_settings.py.pip.sample b/example_project/local_settings.py.pip.sample
deleted file mode 100644
index 6b6cffc..0000000
--- a/example_project/local_settings.py.pip.sample
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# rename this file to local_settings.py and overload settings in this file
-
-import os
-
-STATIC_URL = '/static/'
-
-CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL
-CHIMERE_OSM_USER = 'osm_user'
-CHIMERE_OSM_PASSWORD = 'osm_pass'
-
-# Make this string unique, and don't share it with anybody.
-SECRET_KEY = ''
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'NAME': 'chimere',
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'HOST': 'localhost',
-        'PORT': '5432',
-        'USER': 'postgres',
-        'PASSWORD': '',
-    },
-}
-
-ROOT_URLCONF = 'example_project.urls'
-
-INSTALLED_APPS += ['django_extensions',
-                   'tinymce']
-
-TINYMCE_URL = '%stiny_mce/' % STATIC_URL
-JQUERY_JS_URLS = ('%sjquery/jquery.js' % STATIC_URL,
-                  'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js')
-JQUERY_CSS_URLS = ('https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css')
diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample
deleted file mode 100644
index b5939af..0000000
--- a/example_project/local_settings.py.sample
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# rename this file to local_settings.py and overload settings in this file
-
-import os
-
-CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL
-CHIMERE_OSM_USER = 'osm_user'
-CHIMERE_OSM_PASSWORD = 'osm_pass'
-
-# Make this string unique, and don't share it with anybody.
-SECRET_KEY = ''
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'NAME': 'chimere',
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'HOST': 'localhost',
-        'PORT': '5432',
-        'USER': 'postgres',
-        'PASSWORD': '',
-    },
-}
-
-ROOT_URLCONF = 'example_project.urls'
diff --git a/example_project/manage.py b/example_project/manage.py
deleted file mode 100755
index 301acc2..0000000
--- a/example_project/manage.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-import os, sys
-from django.core.management import execute_manager
-sys.path.insert(0, os.path.abspath('./..'))
-
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)
diff --git a/example_project/media/icons/marker.png b/example_project/media/icons/marker.png
deleted file mode 100755
index ccd1913..0000000
--- a/example_project/media/icons/marker.png
+++ /dev/null
diff --git a/example_project/media/icons/readme b/example_project/media/icons/readme
deleted file mode 100644
index 560759a..0000000
--- a/example_project/media/icons/readme
+++ /dev/null
@@ -1 +0,0 @@
-Icons are stored here
diff --git a/example_project/media/pictures/readme b/example_project/media/pictures/readme
deleted file mode 100644
index c0d20b7..0000000
--- a/example_project/media/pictures/readme
+++ /dev/null
@@ -1 +0,0 @@
-Pictures are stored here
diff --git a/example_project/media/route_files/readme b/example_project/media/route_files/readme
deleted file mode 100644
index 90d72ab..0000000
--- a/example_project/media/route_files/readme
+++ /dev/null
@@ -1 +0,0 @@
-Route files are stored here
diff --git a/example_project/settings.py b/example_project/settings.py
deleted file mode 100644
index c48a847..0000000
--- a/example_project/settings.py
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Don't edit this file:
-# overload all theses settings in your local_settings.py file
-
-import os
-
-DEBUG = False
-TEMPLATE_DEBUG = DEBUG
-
-# Django settings for chimere project.
-PROJECT_NAME = u'Chimère'
-ROOT_PATH = os.path.realpath(os.path.dirname(__file__)) + "/"
-
-EMAIL_HOST = 'localhost'
-STATIC_URL = '/static/'
-STATIC_ROOT = ROOT_PATH + 'static/'
-
-TINYMCE_URL = '/tinymce/'
-JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
-                  '/javascript/jquery-ui/jquery-ui.js',)
-JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css',
-                   '/javascript/jquery-ui-themes/base/jquery.ui.all.css')
-
-OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"]
-
-GPSBABEL = '/usr/bin/gpsbabel'
-GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an
-                                                      # error of 5 meters
-#GPSBABEL_OPTIONS = 'simplify,count=100'
-
-## chimere specific ##
-CHIMERE_DEFAULT_ZOOM = 10
-# center of the map
-CHIMERE_DEFAULT_CENTER = (-1.679444, 48.114722)
-# projection used by the main map
-# most public map providers use spherical mercator : 900913
-CHIMERE_EPSG_PROJECTION = 900913
-# projection displayed to the end user by openlayers
-# chimere use the same projection to save its data in the database
-CHIMERE_EPSG_DISPLAY_PROJECTION = 4326
-# display of shortcuts for areas
-CHIMERE_DISPLAY_AREAS = True
-# number of day before an event to display
-# if equal to 0: disable event management
-# if you change this value from 0 to a value in a production environnement
-# don't forget to run the upgrade.py script to create appropriate fields in
-# the database
-CHIMERE_DAYS_BEFORE_EVENT = 30
-# allow feeds
-CHIMERE_FEEDS = True
-
-CHIMERE_ICON_WIDTH = 21
-CHIMERE_ICON_HEIGHT = 25
-CHIMERE_ICON_OFFSET_X = -10
-CHIMERE_ICON_OFFSET_Y = -25
-
-# display picture inside the description by default or inside a galery?
-CHIMERE_MINIATURE_BY_DEFAULT = False
-
-# JS definition of the default map (for admin and when no map are defined in
-# the application)
-# cf. OpenLayers documentation for more details
-CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" # OSM mapnik map
-
-CHIMERE_XAPI_URL = 'http://open.mapquestapi.com/xapi/api/0.6/'
-CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL
-CHIMERE_OSM_USER = 'test'
-CHIMERE_OSM_PASSWORD = 'test'
-
-# as the web server need to be reloaded when property models are changed
-# it could be a good idea to hide it to an admin who could'nt do that
-CHIMERE_HIDE_PROPERTYMODEL = False
-
-# encoding for shapefile import
-CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1'
-
-# thumbnail
-CHIMERE_THUMBS_SCALE_HEIGHT=250
-CHIMERE_THUMBS_SCALE_WIDTH=None
-
-CHIMERE_CSV_ENCODING = 'ISO-8859-1'
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'NAME': 'ratatouille',
-        'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'HOST': 'localhost',
-        'PORT': '5432',
-        'USER': 'ratatouille',
-        'PASSWORD': 'wiki',
-    },
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-# although not all variations may be possible on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'Europe/Paris'
-
-# Language code for this installation. All choices can be found here:
-# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-# http://blogs.law.harvard.edu/tech/stories/storyReader$15
-LANGUAGE_CODE = 'fr-fr'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-USE_L10N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ROOT_PATH + 'media/'
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = '/media/'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware'
-)
-
-ROOT_URLCONF = 'example_project.urls'
-
-TEMPLATE_DIRS = [
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    ROOT_PATH + 'templates',
-    ROOT_PATH + '../chimere/templates',
-]
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "django.core.context_processors.static",
-    "django.contrib.messages.context_processors.messages",
-    "django.core.context_processors.request",
-)
-
-INSTALLED_APPS = [
-    'django.contrib.auth',
-    'django.contrib.admin',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.gis',
-    'django.contrib.staticfiles',
-    'south',
-    'chimere',
-    # activate it if you want to use old migration scripts
-    #'chimere.scripts',
-]
-
-# celery
-try:
-    import djcelery
-    import kombu
-    djcelery.setup_loader()
-    BROKER_URL = 'django://'
-    INSTALLED_APPS += ['kombu.transport.django',
-                       'djcelery']
-except ImportError:
-    # some import and export will not be available
-    pass
-
-INSTALLED_APPS += [
-    'south',
-    'chimere',
-    # activate it if you want to use old migration scripts
-    #'chimere.scripts',
-]
-
-LOGGING = {'version': 1,
-     'disable_existing_loggers': False,
-    'handlers': {
-        # Include the default Django email handler for errors
-        # This is what you'd get without configuring logging at all.
-        'mail_admins': {
-            'class': 'django.utils.log.AdminEmailHandler',
-            'level': 'ERROR',
-            # But the emails are plain text by default - HTML is nicer
-            'include_html': True,
-        },
-        # Log to a text file that can be rotated by logrotate
-        'logfile': {
-            'class': 'logging.handlers.WatchedFileHandler',
-            'filename': '/var/log/django/chimere.log'
-        },
-    },
-    'loggers': {
-        # Again, default Django configuration to email unhandled exceptions
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-        # Might as well log any errors anywhere else in Django
-        'django': {
-            'handlers': ['logfile'],
-            'level': 'ERROR',
-            'propagate': False,
-        },
-        # Your own app - this assumes all your logger names start with "myapp."
-        'chimere': {
-            'handlers': ['logfile'],
-            'level': 'WARNING', # Or maybe INFO or DEBUG
-                'propogate': False
-        },
-    },
-}
-
-try:
-    from local_settings import *
-except ImportError, e:
-    print 'Unable to load local_settings.py:', e
-
-if 'CHIMERE_SHARE_NETWORKS' not in globals():
-    # after the locals to get the right STATIC_URL
-
-    # share with
-    global CHIMERE_SHARE_NETWORKS
-    CHIMERE_SHARE_NETWORKS = (
-    ("Email", 'mailto:?subject=%(text)s&body=%(url)s',
-                 STATIC_URL + 'chimere/img/email.png'),
-    ("Facebook", 'http://www.facebook.com/sharer.php?t=%(text)s&u=%(url)s',
-                 STATIC_URL + 'chimere/img/facebook.png'),
-    ("Twitter", 'http://twitter.com/home?status=%(text)s %(url)s',
-                 STATIC_URL + 'chimere/img/twitter.png'),
-    ("Identi.ca", 'http://identi.ca/index.php?action=newnotice&status_textarea=%(text)s %(url)s',
-                 STATIC_URL + 'chimere/img/identica.png'),
-    )
-
-if 'OSM_JS_URLS' not in globals():
-    global OSM_JS_URLS
-    OSM_JS_URLS = [STATIC_URL + "chimere/js/OpenLayers.js",
-                   STATIC_URL + "chimere/js/SimplePanZoom.js",
-                   "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"]
-
diff --git a/example_project/templates/chimere/blocks/overload_templates_here b/example_project/templates/chimere/blocks/overload_templates_here
deleted file mode 100644
index e69de29..0000000
--- a/example_project/templates/chimere/blocks/overload_templates_here
+++ /dev/null
diff --git a/example_project/templates/chimere/overload_templates_here b/example_project/templates/chimere/overload_templates_here
deleted file mode 100644
index e69de29..0000000
--- a/example_project/templates/chimere/overload_templates_here
+++ /dev/null
diff --git a/example_project/templates/overload_templates_here b/example_project/templates/overload_templates_here
deleted file mode 100644
index e69de29..0000000
--- a/example_project/templates/overload_templates_here
+++ /dev/null
diff --git a/example_project/urls.py b/example_project/urls.py
deleted file mode 100644
index e37ae53..0000000
--- a/example_project/urls.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# See the file COPYING for details.
-
-from django.conf import settings
-from django.conf.urls.defaults import *
-
-from django.contrib import admin
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-admin.autodiscover()
-urlpatterns = patterns('django.views.static',
-    (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve',
-     {'document_root': settings.MEDIA_ROOT}),
-)
-
-if "tinymce" in settings.INSTALLED_APPS:
-    urlpatterns += patterns('django.views.static',
-        (r'^tinymce/', include('tinymce.urls')),)
-
-urlpatterns += staticfiles_urlpatterns()
-
-urlpatterns += patterns('',
-    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^admin/', include(admin.site.urls)),
-    url(r'^', include('chimere.urls', namespace="chimere")),
-)
-
-
diff --git a/requirements.txt b/requirements.txt
index f458f31..de82ab9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
-django==1.4
+django>=1.4,<1.4.99
 beautifulsoup
 psycopg2
 pil
 lxml
-south==0.7.3
+south>=0.7.3,<0.7.99
 simplejson
 feedparser
 django-extensions
diff --git a/setup.py b/setup.py
index 0e990a4..b7bf65b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     install_requires=reqs,
+    #test_suite = "chimere.runtests.runtests",
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',