continue fix for 3470
commit by another person for fix 3333
added method three
added method five
Merge branch 'development'

Conflicts:
	testprj/src/testprj/FileWriter.java