Merge origin/master

Conflicts:
	build/classes/tranzchat/Auth.class
	src/tranzchat/Auth.java