he

he
Merge branch 'master' of https://github.com/Elekron/main

Conflicts:
	java/com/google/glassware/MainServlet.java
	resources/oauth.properties