update

Signed-off-by: simon <simonguo.2009@gmail.com>
Merge branch 'master' of https://github.com/simonguo/beehive.crm

Conflicts:
	module/calendar_edit.php