all jsp pages script tags and css tags
Merge remote-tracking branch 'origin/master'