Added some Javascript libraries
Merged master into master