Added FlexSlider Field Collection
Merge branch 'master' of github.com:ITS-UofIowa/uiowa.edu

Conflicts:
	modules/custom/flexslider_field_collection/flexslider_field_collection.info