Merge branch 'berger' into dev

Conflicts:
	BYU/BYU/HubPage.xaml.cs
	BYU/Common/Common.csproj