office edit

add funcation _update(*args,*kw):pass
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/transwarp/db.py