support local email template for i18n refs #18
error on missing mandrill api key
another fix for the no-counter case
fix regex bug
more fixes to getlantern/lantern#488 : counters
use email instead of federated identity for csrf protection
version bump
hopefully fix JID handling in friend sync.  Fixes getlantern/lantern#851
Bump version to deploy.
fix people with uppercase in their email addresses
added methods for viewing and deleting friends -- for now only used by remote api calls
Merge branch 'master' of github.com:getlantern/lantern-controller
handle pending friends better
Merge pull request #32 from getlantern/i18n

I18n
Commit prior to mergin in Leah's Mandrill changes.
Pre-deploy script, and bump version for new release.
Document problem with csrf secrets on deploy, workaround.
Merge branch 'master' into rally

Conflicts:
	.classpath
	src/org/lantern/LanternControllerConstants.java
	src/org/lantern/MandrillEmailer.java
	test/org/lantern/MandrillEmailerTest.java
	war/WEB-INF/appengine-web.xml
Add new templates.
First pass at credit warning template.  Yes, it's ugly..