Merge branch 'master' of https://github.com/vanduynslagerp/enml4j

Conflicts:
	src/main/java/com/syncthemall/enml4j/impl/DefaultTodoTagConverter.java
Merge branch 'master' of https://github.com/vanduynslagerp/enml4j

Conflicts:
	src/main/java/com/syncthemall/enml4j/impl/DefaultTodoTagConverter.java