Merge branch 'master' of https://github.com/fannart/screenwriter into views

Conflicts:
	Screenwriter/Screenwriter.csproj
	Screenwriter/Views/Account/Register.cshtml
Merge branch 'master' of https://github.com/fannart/screenwriter.git