bill js update
Merge branch 'master' of github.com:Spectax/SPCAqua
lots of small changes