Merge pull request #1724 from asalani93/as_fixcpicker

Add images to the list of automatically included files
adds colorpicker version to gemfile