css, js, merge c-ből

Signed-off-by: Balázs <balazs@balazs-Inspiron-N7010.(none)>