whatever
Merge branch 'master' of https://github.com/mtoonen/propertiesparser

Conflicts:
	src/test/java/nl/meg/propertiesutility/PropertiesTest.java