from my laptop again
Merge branch 'master' of github.com:moshebs/svn2git-test

Conflicts:
	src/main/config/config.properties