Fixed display bug in Liliko Next-template, merged some javascript files