updated endpage and spinjs
mergefix