update tlottype
add DrawActivity
Merge branch 'master' into lichenxing

Conflicts:
	src/main/resources/META-INF/spring/mgr.properties