adding js
merged some stuff
Merge branch 'master' of https://github.com/PhoenixRockit/tgStudent