moved JS include to after the opening <body> tag
Merge remote-tracking branch 'origin/master'