Added category option check.
Merge branch '2.0' of https://github.com/openbaypro/OpenBay-Pro into 2.0