Merge branch 'develop' of https://github.com/tpkelly/voting-application into develop
Merge branch 'develop' of https://github.com/stevenhillcox/voting-application into develop
Merge branch 'develop' of https://github.com/stevenhillcox/voting-application into develop
Adds ability to delete options
Makes various buttons and forms more bootstrap-like
Removes modal dialogue
Adds information and description information to options in the admin panel
Merge pull request #16 from stevenhillcox/feature/delete-options

Adds the ability to delete options from admin panel
Adds basic authentication to delete controllers
Merge pull request #17 from stevenhillcox/feature/admin-login

Adds basic authentication to delete controllers
Merge branch 'upstream' into feature/voting-sessions

Conflicts:
	VotingApplication/VotingApplication.Web.Api/Scripts/VoteAppPages/Admin.js
	VotingApplication/VotingApplication.Web.Api/Views/Admin1790/Index.cshtml