merged branch dsm into trunk
migrated to dnet45
codebase used to migrate to java8 the production system