precompile vendor
fixed conflicts
deleted old images
Merge branch 'master' of heroku.com:soundframe
moved jquery in order to fix heroku assets compiling
clear assets