update style and menu
correct conflict

Merge branch 'master' of https://github.com/clementTal/materialCss

Conflicts:
	sass/misc/_button.scss