Merge branch 'stage4' into stage5

Conflicts:
	templates/c_admin/base.html
1492: Горит - %EVENT_SHORT_REVIEW%
1459: Этап №5: Дополнительно - Мета-теги
1491: Горит - Название вывести перед кратким описанием
Залил это все в 4-й этап, сразу смержил с 5-м.

settings/templatetags/template_filters.py

@@ -338,3 +338,6 @@ def get_pages(objects, number):
     x, y = divmod(len(objects), int(number))
     return xrange(x if y == 0 else x + 1)
 
+@register.filter
+def lowfirst(value):
+    return value[:1].lower() + value[1:] if value else ''

templates/client/includes/conference/conference_object.html

@@ -36,7 +36,7 @@
 				<header>
 					<h1 class="i-title">
 					{% if event.main_title %}
-						{{ event.main_title|safe }} {{ event.name|safe }}
+						{{ event.name|safe }} - {{ event.main_title|safe|lowfirst }}
 					{% else %}
 						{{ event.name|safe }}
 					{% endif %}

templates/client/includes/conference/conference_paid.html

@@ -44,7 +44,7 @@
 				<header>
 					<h1 class="i-title">
 					{% if event.main_title %}
-						{{ event.main_title|safe }} {{ event.name|safe }}
+						{{ event.name|safe }} - {{ event.main_title|safe|lowfirst }}
 					{% else %}
 						{{ event.name|safe }}
 					{% endif %}

templates/client/includes/exposition/expo_paid.html

@@ -42,7 +42,7 @@
 				<header>
 					<h1 class="i-title">
 					{% if exposition.main_title %}
-						{{ exposition.main_title|safe }} {{ exposition.name|safe }}
+                        {{ exposition.name|safe }} - {{ exposition.main_title|safe|lowfirst }}
 					{% else %}
 						{{ exposition.name|safe }}
 					{% endif %}

templates/client/includes/exposition/exposition_object.html

@@ -39,7 +39,7 @@
 				<header>
 					<h1 class="i-title">
 					{% if exposition.main_title %}
-						{{ exposition.main_title|safe }} {{ exposition.name|safe }}
+						{{ exposition.name|safe }} - {{ exposition.main_title|safe|lowfirst }}
 					{% else %}
 						{{ exposition.name|safe }}
 					{% endif %}