Merge remote-tracking branch 'origin/master'

Conflicts:
	ola/ola.webapi/API/MemberController.cs
	ola/ola.webapi/Web.config