Mention Google analytics in integration prerequisites
Add PNRGC logo
Fix install.sh not compiling locale messages (fixes #965)
Update docs about service restart
Moved trek completeness fields to setting  (fixes #967)
Add detail about update with make deploy in settings.ini
Fix regression about source locale messages (fixes #970, ref #704)

Conflicts:

	CHANGES
	Makefile
Fix regression link  lost from adminsite (fixes #971)
Serve uploaded files as attachments (fixes #972)
Remove help texts being shown from filter forms (fixes #966)
Fix form pills for translated languages (fixes #968)
Fix tests
Merge pull request #973 from makinacorpus/various_fixes_v0.22

Various fixes v0.22
Bump version
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	CHANGES
	VERSION
	docs/conf.py
Fix compilation of translations (ref #970)
Fix distinction between languages and translated languages (fixes #968)
Fix history tabs not being shown after upgrade to Django 1.6 (fixes #975)
Fix regression POI not visible in trek detail page (ref #979)
Fix regression on land layer label colors (fixes #980)