added javascript tag back in
Merge branch 'development'