integrated D3, cleaning up
Merge branch 'integrating-D3'

Conflicts:
	ipd-ui/ui-upgrade.html