Fix initial hiding of buttons
Merge branch 'master' into bootswatch

* master:
  Fix initial hiding of buttons

Conflicts:
	gulpfile.js