adding subtheme
final provisioning commit
Change base theme to UHD base

Signed-off-by: Jalessa <jalessa-hall@uiowa.edu>
ignore .sass-cache
Simplify output style
Initial recommit
wrapper debug

Signed-off-by: Jalessa <jalessa-hall@uiowa.edu>
Merge branch 'master' of github.com:ITS-UofIowa/vending.uiowa.edu

Signed-off-by: Jalessa <jalessa-hall@uiowa.edu>

Conflicts:
	themes/vending/css/global.styles.css
changed theme screenshot.png
Added geofield 2.0
Added uiowa buildings feeds importer
Added vending areas feature
rm accidential submodule commit
Added geofield 2.x
Added vending area views feature
Fix map attachment rendering.
Add #states visibility to vending type selection
Fixed states to use correct tids
Fixed field rendering order on vending area edit form.
Preprocess the vending machine fields to make them pretty.