Fixed filtered items
Working on blackbox categories
Merge branch 'master' of https://github.com/kishandchips/ivip

Conflicts:
	inc/shortcodes.php
	js/main.js