Upgrade to 2.0
Merge remote-tracking branch 'origin/master' into AKR

Conflicts:
	Configuration/VirtualDirectory/Config/Viewer.xml
	Template.xml
	VirtualDirectory/Viewer.Defaults.xml
Copied new default template to NPS
NPS Specific changes to default template
Set new theme, remove obscuring image
Small Fix to Banner
Merge remote-tracking branch 'origin/AKR' into GLBA

Conflicts:
	Configuration/VirtualDirectory/Config/Viewer.xml
	Template.xml
GLBA specific banner