Bunch of minor bugfixes
Bunch of minor bugfixes
Merge branch 'master' into laura_and_will
Tab fixes, new tests, reworking modals
Minor regression bug
Enabling map on production
Bunch of minor bugfixes
Tab fixes, new tests, reworking modals
Minor regression bug
Dereferencing groups and adding modals to page
Merge branch 'master' into laura_and_will

Conflicts:
	app/assets/javascripts/templates/partials/enterprise_header.html.haml
	app/views/shopping_shared/_contact.html.haml
	spec/features/consumer/home_spec.rb
Fixing groups page anchor scrolling
Adding some basic animations, upgrading Angular Foundation
Adding enterprises to cart to prevent errors being thrown
Fixing a regression bug
Merge branch 'master' into laura_and_will