normail user can not edit famliys
Merge branch 'master' into keith

Conflicts:
	app/views/families/index.html.haml
Merge branch 'master' into rob
fixing family manage links