added bower to build task
moves images out of public dir
fix merge conflict
remove unused images from server