merge master branch with architectureRemodelation
fix classpath conflicts