Adding header for js, php and html
Merging from master