jquery cookie
Merging
Merge branch 'master' of github.com:tags/geologgerui

Conflicts:
	js/jquery.cookie.js
Switching to tags.animalmigration.org