deleted assets, made plus icons into image sprite
deleted assets
resolving merge conflict