Add parent member list to group invitations page for subgroups
Merge pull request #1217 from loomio/feature/invite-to-subgroup

Invite to subgroup
remove archived groups from group tree
add legal stuff to about page
Merge pull request #1227 from loomio/hotfix/group-tree

remove archived groups from group tree
Merge pull request #1228 from loomio/compliance

add legal stuff to about page
fix FactoryGirl issue that causes Travis to fail intermittently
Merge branch 'master' of github.com:loomio/loomio into nice-urls-v2

Conflicts:
	app/controllers/groups_controller.rb
	spec/controllers/groups_controller_spec.rb