Merge pull request #290 from wardi/master

correct "unified resource format" for jpeg 2000
Update README.rst
translations
wedge in google analytics
Merge branch 'master' of git://github.com/open-data/ckanext-canada

Conflicts:
	i18n/fr/LC_MESSAGES/canada.po
Merge pull request #291 from deniszgonjanin/master

translations and google analytics
Update megamenu and footer to the latest
Merge pull request #292 from thriuin/master

Update the mega-menu  and footer for CKAN and the French translations
Minor megamenu fix and fix to dataset comment link
Merge pull request #293 from thriuin/master

Minor megamenu fix and fix to dataset comment link
update some French translations and links