Update membership page
Merge branch 'master' of https://github.com/stromme/child-wc-network

Conflicts:
	page-locations.php
Move locations page template