Merge commit '3e5e53ef5a43ce549ed9b67fd3060c23b8ff1120'
Squashed 'wp-content/themes/wptimber-biosciences/' changes from 3ebbac7..2e5ab21

2e5ab21 messy commit for scientist pages, added foundation grid and corresponding templates

git-subtree-dir: wp-content/themes/wptimber-biosciences
git-subtree-split: 2e5ab215a377cc381a75c4e5d4e4c863017224ec
merging everything, updated the subtree scripts
changes the push script for the theme
Squashed 'wp-content/themes/wptimber-biosciences/' changes from 2e5ab21..eb3608b

eb3608b editing the onestop pages to be a bit more complient to the norm templating
2e8d412 Merge commit '3e5e53ef5a43ce549ed9b67fd3060c23b8ff1120'
0344421 Some css changes
870396c iframe data available now
2347299 The link styling fix didn't work :(
058b543 link styling fix
e52af2c Added more rows in wysiwyg editor
ce49f8f Slight change to single onestop element view
2a1b4bb Now adding files in css folder
3ff49d4 Tabbed onestop power
24a9210 Added tabs to onestop elements
b75c6d8 Merge branch 'master' of https://github.com/lblpbd/pbd.lbl.gov into tabbed-onestop
57ca34c Merge commit '3f6bad6e289da2498a9118881df9a9fc9113896b'
d486346 Implemented tabbed onestop pages
d884792 Merge commit 'b7089ec932d0dbae65206d88ee8e97139357025f'
a26c5a2 updating github to reflect the most recent snapshot

git-subtree-dir: wp-content/themes/wptimber-biosciences
git-subtree-split: eb3608b7b3ac2dba17078bb1315fdd80f2a73527
Merge commit '6f32a21ee538c593002448df20257e10b941dec4'

Conflicts:
	wp-content/themes/wptimber-biosciences/assets/css/lib/foundation.css
	wp-content/themes/wptimber-biosciences/assets/vendor/foundation/.bower.json
	wp-content/themes/wptimber-biosciences/assets/vendor/typeplate/.bower.json
	wp-content/themes/wptimber-biosciences/onestop_element.php
	wp-content/themes/wptimber-biosciences/views/onestop/single.twig