Diagram editing.
Merge branch 'master' of github.com:buddycloud/buddycloud.com

Conflicts:
	buddycloud-theme/templates/all-features.html
	content/pages/features-full.html
	content/pages/full-features.html