readme
import_members
members: partner, parent1 and parent2
Renamed UserProfile to Member
Merge branch 'master' of github.com:lingthio/menno.org

Conflicts:
	app/static/app/app.css
	app/templates/base_templates/base.html
sortable member_directory_page
Added search to member_directory_page.
import_members
edit_member_page
fixing header text on log in page
Merge branch 'master' of github.com:lingthio/menno.org