update
Merge branch 'master' of https://github.com/tonysh518/lily_official

Conflicts:
	html/functions.php