Added DF links
Fixed merge conflics, few small bugs fixed

Conflicts:
	Build/index.html
	index.html