update documentation
clean rjs files
Merge remote-tracking branch 'origin/master'