Add own javascript files managing
Merge branch 'master' into dev1