Merge branch 'dev' into feature/demos

Conflicts:
	app/local_settings.py

diff --cc app/local_settings.py
index e5a9f4c8672d0f45837db86e1338814b9f353ae5,17f7313a086a19bd7cadc1320ad34a2f68bf2108..98e4c370be45a36612bfa45027488a62356ce304
--- 1/app/local_settings.py
--- 2/app/local_settings.py
+++ b/app/local_settings.py
@@@ -219,9 -223,3 +223,5 @@@ JQUERY_UI_FILENAME = 'jquery-ui-1.9.2.m
  #SHOP_CURRENCY_LOCALE = ''
  SHOP_USE_VARIATIONS = False
  SHOP_USE_RATINGS = False
- date_now = datetime.now()
- CURRENT_SEASON = int(date_now.year) - 1 if datetime(date_now.year, 1,1) <= date_now and date_now <= datetime(date_now.year, 7, 31) else date_now.year
- CURRENT_SEASON_STYLED = str(CURRENT_SEASON)[-2:]+"."+str(CURRENT_SEASON+1)[-2:]
- 
 +
 +PROJECT_DEMOS_DIR = '/srv/media/projects/demos/'

diff --cc app/organization/projects/admin.py
index d507ca1bb4316976447f2214aa40af9841458013,d507ca1bb4316976447f2214aa40af9841458013..89f65000c12d1376e559dc231f5f51e3e8c99154
--- 1/app/organization/projects/admin.py
--- 2/app/organization/projects/admin.py
+++ b/app/organization/projects/admin.py
@@@ -80,3 -80,3 +80,6 @@@ admin.site.register(ProjectProgram, Pro
  admin.site.register(ProjectProgramType, ProjectProgramTypeAdmin)
  admin.site.register(ProjectTopic, ProjectTopicAdmin)
  admin.site.register(ProjectTopicPage, ProjectTopicPageAdmin)
++admin.site.register(ProjectDemo)
++admin.site.register(Repository)
++admin.site.register(RepositorySystem)

diff --cc app/organization/projects/translation.py
index 5cf18d9d392f9231acf2020de3e492af0d9a62bb,5cf18d9d392f9231acf2020de3e492af0d9a62bb..8398acd61644ec422c05d6c8a7aad34fffa5a2b4
--- 1/app/organization/projects/translation.py
--- 2/app/organization/projects/translation.py
+++ b/app/organization/projects/translation.py
@@@ -61,3 -61,3 +61,9 @@@ class ProjectTopicTranslationOptions(Tr
  class ProjectTopicPageTranslationOptions(TranslationOptions):
  
      fields = ('sub_title',)
++
++
++@register(ProjectDemo)
++class ProjectDemoTranslationOptions(TranslationOptions):
++
++    fields = ('title', 'description',)