Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	VotingApplication/VotingApplication.Web.Api/Controllers/API Controllers/PollController.cs
Host URI now a configurable option
Small fix
Merge pull request #63 from stevenhillcox/develop

Removed unnecessary punctuation from emails.
Merge branch 'develop' into feature/info-page

Conflicts:
	VotingApplication/VotingApplication.Web.Api/Controllers/API Controllers/PollController.cs