Web page
changed version
extra files
simple changes - some related to R CMD check
resolved conflict