Installed Filepicker gem and performed basic design, Ticket0782
Fix merge conflicts on gemlock due to bootstrap-form gem