Added jquery cookie

Conflicts:
	extra/bower.json
Merge branch 'master' into gh-pages