Conflicts:
	console/htdocs/index.html
	controller/controller/Makefile