Commit after test cases/junit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	DateTimeOrganiser.iml
	test/java/SingleFileTestWithDestinationDir.java
	test/java/TestResourceHelper.java
Commit