Adjusts styles for color picker
Merge branch 'master' into rails
updating photo paths