merge dev branch

full material design qith native cards