[macro] Added a number of macros and their tests
[doc] Cleaned up some constants, deprecated ones that were not used
[merge properties] Now can define the separator for merging properties.
[boolean] Handling of booleans was inconsistent
[model] Deprecated methods that used unused variables
[doc] Minor text change
removed unused code.
[test path] Huh? The path of some test cases was set to some weird URI

Somebody thought it better to get somehow the root URI and turn it in to a File. Did not work reliably, so changed back to the good old addClasspath( new File(“bin”))
[enroute] The enroute templates
Merge pull request #540 from pkriens/master

Several updates