some more changes
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop

Conflicts:
	wp-content/themes/binpress/SPA/apps/user-domains/groups/show/show-group-view.coffee
	wp-content/themes/binpress/SPA/apps/user-domains/groups/show/show-group-view.js
	wp-content/themes/binpress/SPA/apps/user-domains/templates/groupsTemplate.html