t
Merge branch 'master' of https://github.com/chegoon/beautymeets2

Conflicts:
	.DS_Store
	app/.DS_Store
comment json updated