resolved bugs
add category in navigation
resolved conflicts
Merge pull request #182 from priyanka-techmaes/develop-10

Develop 10