Starting work on image slider link
Merge branch 'develop' into feature/better-image-slider-link
more work on better javascript page selector
Fix li in Image Slider

Fixes issue with using li tags in the image slider text.
Fixing file storage location bugs
finishing up better page selector
Merge branch 'feature/better-image-slider-link' into develop
Updates for image slider block
Merge pull request #1570 from mkly/fix_slider_li

Fix li in Image Slider
 add cancel button to page types'
Merge branch 'develop' of github.com:concrete5/concrete5-5.7.0 into develop
Fixing errors with incoming files directory
Fix #1566
Fix #1540
Fix #1571