adding to cookie block list
Merge branch 'master' into cookieblock
Merge branch 'master' into cookieblock

Conflicts:
	doc/sample_cookieblocklist.txt
Merge branch 'cookieblock'