openbaypro/OpenBay-Pro — pull request #11 by Martynas-P (2014-06-04 13:05:00+00:00)
Title: Pulled latest changes from Opencart/opencart master

Pulled latest changes from Opencart/opencart master and resolved conflicts.