use the dev branches

Conflicts:
	default.xml