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

Conflicts:
	Configuration/VirtualDirectory/Config/Viewer.xml
	Template.xml
	VirtualDirectory/Viewer.Defaults.xml