committing so i can merge and try to fix errors
Merge branch 'master' of https://github.com/kalkomey/collective_api

Conflicts:
	public/collective/groups/groups-show/groups-show.html
	public/collective/people/people-index/people-index.html
adding people to groups via drag/drop now works