updated maps to new standard
improved Block::buildFromXML and updated main
includes in test-core
merging changes by Amis