Changes to Quick Login
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/DCQuickLogin.java