Fixed javascript error in neat feature component
Merge remote-tracking branch 'github/master'