updated line endig fixes
Conflicts:

	build.properties.template
	doc.properties