fix css
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zeppelin-web2/app/styles/notebook.css
	zeppelin-web2/app/views/paragraph.html