Added category stuff
Editing helpers to clean up
Working on filtering
Worked on javascript front-end
Merge branch 'develop'
Remove file