update and re-arrange contribute page
Changes for desktop client release version 1.6.1
Fix capital letter
Fix docs links, contact -> people, fix ml link, remove security link
fix merge issue
Fix contributor agreement pdf link
Apply #87 from Jan
Change New Files View Feature
Apply Franks install page fix
Change /contributor to /user (3rd time lucky, slug change required in wp)
Expand first section of each user type on seven features page
Make demo link open in new window
update and re-arrange contribute page
implement feedback
Merge branch 'master' into contribute

Conflicts:
	page-contribute.php
one more addition: bounties.
small first improvement to features page
move from seven to 7 (kelley wanted that!)
Concatenate the list items as they are actually one.
Merge pull request #96 from owncloud/desktop_rel_1.6.1

Changes for desktop client release version 1.6.1