Added javascipt for Categories drop down list
Fix merge conflict