Removed unnecessary templates.
Merge branch 'develop' of github.com:bakerjonas/spiderman into develop

Conflicts:
	data/templates/page.st
Fixed attribute from infoUrl to infoURL.

This caused mapi to go bananas and totally reject the xml.