BUGFIX: Changed url of cookie notice functionality from “cookies” to “cookienotice” so that pages named “cookies” will work
Merge branch 'master' of github.com:Mouseketeers/silverstripe-cookienotice

Conflicts:
	css/cookie-notice.css