flexslider
Merge branch 'november' of https://github.com/UMEngineering/DME-Playground into november

Conflicts:
	campaign/css/campaign.css
	campaign/index.html
Merge branch 'november' of https://github.com/UMEngineering/DME-Playground into november

Conflicts:
	campaign/css/campaign.css
	campaign/index.html