merge dev branch

last changes for release of material style