added new images
precompiled assets
fixed conflicts