Some js taksks.
Merge branch 'master' of https://github.com/valkirilov/FMI-2014-2015