Adding Clear Button
Merge branch 'master' of https://github.com/Sketch-UI/sketch-ui

Conflicts:
	app/assets/javascripts/navigationBar.js