Merge branch 'cleanup' into develop

Conflicts:
	chrome/content/tabutils.js
	chrome/locale/de/tabutils.dtd
	chrome/locale/es-ES/tabutils.dtd
	chrome/locale/it/tabutils.dtd
	chrome/locale/ja-JP/tabutils.dtd
	chrome/locale/pl/tabutils.dtd
	chrome/locale/pt-BR/tabutils.dtd
	chrome/locale/ru/tabutils.dtd
	chrome/locale/zh-TW/tabutils.dtd
Merge branch 'cleanup' into develop

Conflicts:
	chrome/content/tabutils.js
Merge branch 'cleanup' into develop
Copy Tab URL
Copy Title and URL
Bookmark This Tab
Merge branch 'cleanup' into develop

Conflicts:
	chrome/content/preferences.xul
	chrome/content/tabutils.js
	chrome/content/tabutils.xul
	defaults/preferences/prefs.js