new checkbox style, fix #53 TODO: fix ripple
fix #88
Merge remote-tracking branch 'origin/develop'

Conflicts:
	dist/css/material-wfont.min.css
	dist/css/material.min.css
	template/material/css/material-wfont.min.css
	template/material/css/material.min.css
grunt
Merge remote-tracking branch 'origin/master'