Javascript and CSS includes fixup

Include files properly, don't require_tree.

@hishamelgezeery, @muhammedabuali and @AminaZoheir could you lake a look at this?