Removed typescript
Merge branch 'javascript' into dev