apache config
new js version
merge with origin master