Merge branch 'newadblock'

Conflicts:
	addart/chrome/content/artupdate.js
	addart/components/addartAdChanger.js
small cleanups
merging bbonf's clean ups