Remove unneeded margin
Upgrade to Firefox 29.0 beta 6

Conflicts:
	theme/chrome/browser/browser.css