Fixing up glitches with master page
Merge branch 'dev' of github.com:duke-compsci408-fall2014/CancerQuest_app into dev

Conflicts:
	MedConnect/MedConnect/MedConnect/NewViews/LandingPage.cs
	MedConnect/MedConnect/MedConnect/NewViews/TabsHeader.cs
Merge branch 'dev' of github.com:duke-compsci408-fall2014/CancerQuest_app into dev