tweak some invite email constants
fix getlantern/lantern#531
fix counter name
Remove minor duplication of lantern-common utils.
Merge branch 'master' into aws

Conflicts:
	src/org/lantern/LanternControllerConstants.java
	src/org/lantern/XmppAvailableServlet.java
	src/org/lantern/data/Dao.java
Don't log the whole refresh token, for security.