button update
Merge branch 'master' of github.com:Collabforge/META-front

Conflicts:
	db/lifelust_meta.sql