Minor aesthetics, add membership, updated org view
Minor aesthetics and add membership
Merge branch 'master' of https://github.com/Jacketpages/Jacketpages

Conflicts:
	app/Controller/MembershipsController.php