Merge branch 'template-page'

Conflicts:
	src/fitnesse/resources/bootstrap/templates/wikiNav.vm
	src/fitnesse/resources/templates/wikiNav.vm
	src/fitnesse/responders/editing/NewPageResponder.java