added json for makeups and images
edited .gitignore file
fixing merge conflicts
changed routes
Merge branch 'jsonreviews'

removed cached files from log/development