Updated Win8 Quiz layout
Fix errors from dropbox merge
Merge branch 'master' of https://github.com/aenmeyk/BrainThud

Conflicts:
	BrainThud.Web/Test/Scripts/bootstrapper-test.js
	BrainThud.Win/App.xaml.cs
	BrainThud.Win/Views/QuizView.xaml
	BrainThud.Win/Views/QuizView.xaml.cs
	BrainThud.v11.suo