Merge branch 'master' into develop

diff --cc docs/pages/accordion-menu.md
Simple merge

diff --cc docs/pages/button.md
index 3bc3b6ef5ed9a0abae9637ad83241d296f8f1dc7,e603736e048a53dcf61236d240c78511f45895ce..90328507c5e2838053e950da6cf3fc5cb37b9f99
--- 1/docs/pages/button.md
--- 2/docs/pages/button.md
+++ b/docs/pages/button.md
@@@ -160,25 -145,14 +160,25 @@@ The `.disabled` class will give button
  <button type="button" class="button warning" disabled>Disabled</button>
  ```
  
 +Alternatively, you can also use disabled hollow buttons.
 +
 +```html_example
 +<a class="button hollow disabled" href="#" aria-disabled>Disabled</a>
 +<button type="button" class="button hollow primary" disabled>Disabled</button>
 +<button type="button" class="button hollow secondary" disabled>Disabled</button>
 +<button type="button" class="button hollow success" disabled>Disabled</button>
 +<button type="button" class="button hollow alert" disabled>Disabled</button>
 +<button type="button" class="button hollow warning" disabled>Disabled</button>
 +```
 +
  ---
  
 -## Hollow Style
 +## Clear Style
  
 -Add the `.hollow` class to a button to give it a hollow style. Change the `$button-fill` variable in your settings file to `hollow` to make this the default style. Changing this setting will remove the `.hollow` class from your CSS.
 +Add the `.clear` class to a button to give it a clear style. Change the `$button-fill` variable in your settings file to `clear` to make this the default style. Changing this setting will remove the `.clear` class from your CSS.
  
  <p>
-   <a class="" data-open-video="4:04"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
+   <a class="" data-open-video="7:37"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
  </p>
  
  

diff --cc docs/pages/grid.md
Simple merge

diff --cc docs/pages/reveal.md
Simple merge