introduce partials, improved gulp tasks
fixed conflicts