added merged and compressed css and js