Merge pull request #1 from Xirg/develop

changed to use new nxtgn design
Merge pull request #2 from Xirg/develop

new categories search, fix: bad commit ina4dd419
forgot one line of code

whoops forgot the new search string
Merge pull request #3 from Xirg/master

update to lastes master