merged js/css for version 1