download features 7.x-2.0-rc1
update media to latest
update file entity to latest
update adddressfield to 7.x-1.0-beta4
update admin_views to 7.x-1.2
update auto_entitylabel to 7.x-1.2
update ds to 7.x-2.3
update entity to 7.x-1.1
update feeds_xpathparser to 7.x-1.0-beta4
update flag to 7.x-2.1
update flexslider to 7.x-2.0-alpha1
update inline_entity_form to 7.x-1.2
update jquery_update to 7.x-2.3
update leaflet to 7.x-1.0-beta3
update location to 7.x-3.0-rc1
update relation_add to 7.x-1.0
update select_or_other to 7.x-2.17
download flexslider_views_slideshow latest
Merge branch 'master' of github.com:/ITS-UofIowa/SiteNow-Custom-Contrib-Modules

Conflicts:
	media/includes/media.filter.inc
	media/js/wysiwyg-media.js