better handling of version updates; fix some jars
Merge branch 'master' into aws

Conflicts:
	src/org/lantern/LanternControllerConstants.java
	src/org/lantern/XmppAvailableServlet.java