added a new property to separate tokens
Merge branch 'develop' of https://github.com/korpling/pepperModules-GenericXMLModules.git into develop