changing button location
Merge branch 'development'
changed redirect path
sorted images on show page
working modals