membership
Added Service field to memberlist
Merge branch 'feature/Membership'

Conflicts:
	themes/Bulli/css/site.css