Fixed normalize merge confligt
Finished components and javascript demo