Solaris hacks
Merge branch 'master' of file:///C/Users/Sean/Documents/GateOne-solaris-ball

Conflicts:
	gateone/auth/authentication.py