Renamed more explicit to avoid overlaps
Merge pull request #117 from mdxs/upd_user_coffee

Renamed more explicit to avoid overlaps
Removed titles from special permissions
Added safe filter for next_link caption.
Merge pull request #120 from gmist/safe_caption

Added safe filter for next_link caption
Removed spaces in Jinja2 filters
Added Yandex.Metrika web analytics (http://metrica.yandex.com).
Merge branch 'ya_metrika'

Conflicts:
	main/admin.py
	main/model.py