set version to 1.3.0-dev
Merge branch 'master' into develop

Conflicts:
	ChangeLog.txt
	pom.xml
use subfolder strategy to implement variations of types of subfolders (Issue #5)
form to configure subfolderStrategy for FileRepo (Issue #5)
added tests for subfolder strategies (Issue #5)
ensure FileRepoCleanupThread doesn't remove latest folder (Issue #5)
added change log
Merge branch 'feature/issue5' into develop
set version to 1.3.0
Merge branch 'develop'