Merge branch 'dev' into prestashop

Conflicts:
	app/settings.py
	lib/django-eve

diff --cc app/local_settings.py
Simple merge

diff --cc app/settings.py
index 3129ad9fd815faddfc3b3257047b5e448107dbaf,2231530d29df4b7656b31c8b3280b850dbc9f948..58da1f2d48c903dee6affc956e016891d1eae07a
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -217,16 -221,15 +221,15 @@@ INSTALLED_APPS = 
      "mezzanine.blog",
      "mezzanine.forms",
      # "mezzanine.galleries",
++    # "mezzanine.mobile",
      "mezzanine.twitter",
      "mezzanine.accounts",
-     # "mezzanine.mobile",
      "cartridge.shop",
 -    # "mezzanine.mobile",
 -    # "eve",
 +    "eve",
 +    "prestashop",
      'djangobower',
      "meta",
      "mezzanine_agenda",
--#    "orderable",
      "organization.core",
      "organization.media",
      "organization.pages",