merge dev branch

full material design with native cards