Implemented File Upload for gallery
Fixed nested forms issue
Resolved merge conflicts