Merge changes on 'train-2012.07.30' into dev

Conflicts:
	.gitignore
	ChangeLog
	lib/email.js
	package.json
	scripts/browserid.spec

ChangeLog

-train-2012.08.03 (in progress):
+train-2012.08.17:
 
+train-2012.07.30:
+  * Emails are prettier!  They now include both HTML and Text versions: #1890
+  * (hotfix 2012.08.03) l10n fix, string extraction, email templates are moved: #2122
+  * (hotfix 2012.08.06) Fix IE8 not remembering you: #2183, #2218
+  * (hotfix 2012.08.09) Fix IE8 / secondary verification in same browser: #2206
 
 train-2012.07.20:
   * Introduction of "static" process which serves views and static resources: #1757

scripts/browserid.spec

 %define _rootdir /opt/browserid
 
 Name:          browserid-server
-Version:       0.2012.08.03
+Version:       0.2012.08.17
 Release:       1%{?dist}_%{svnrev}
 Summary:       BrowserID server
-Packager:      Pete Fritchman <petef@mozilla.com>
+Packager:      Gene Wood <gene@mozilla.com>
 Group:         Development/Libraries
 License:       MPL 2.0
 URL:           https://github.com/mozilla/browserid