added category filtering on product controller
fixed gitignore
Merge branch 'staging' into development