Fake angular calls
Remove jpg thumbnails
Merge conflict