proposal add
Merge branch 'refs/heads/dev'

Conflicts:
	lunchy/client/views/groupDetail.js