basic popup to allow users to unblock oauth sites
Merge branch 'master' into feature/allow3rdparties
Merge branch 'master' into feature/allow3rdparties

Conflicts:
	metadata.chrome
move domainExceptions to src and add require boilerplate around it
Merge branch 'cookiehandlingexperiment' into feature/allow3rdparties

Conflicts:
	src/background.js
	src/popup.js
	src/webrequest.js
refactor domain exceptions
Merge branch 'cookiehandlingexperiment' into feature/allow3rdparties
Merge branch 'master' into feature/allow3rdparties

Conflicts:
	src/background.js
	src/webrequest.js
Merge branch 'master' into feature/allow3rdparties

Conflicts:
	src/webrequest.js
Merge branch 'master' into feature/allow3rdparties
Merge branch 'master' into feature/allow3rdparties
basic dialog for user choice on whitelisting 3rd parties
make filter to whitelist 3rd parties on a specific first party work
undo button works on per-domain filters
css for privacy badger popup
refactor domain exception object, make popup more clear
make sure page css does not mess with our popup
add instapaper, pocket, kinja and facebook connect to popup list
adding www.facebook.com to cookie block list because some people really want to see facebook comments
Making popup box bigger