assiso commit
front code
Merge branch 'develop' of https://github.com/lao605/zzc into develop

Conflicts:
	zzc/adam2014/auth/Httpsession.py