merge dev branch

last changes for material style