Merge branch 'master' of https://github.com/bruno63/renfiles

Conflicts:
	renfiles/renfiles.properties
	renfiles/src/renfiles/RenameFiles.java
?
=
asdf