changes for compilation mode
Merge branch '3.0' of github.com:gigya/Gigya-Magento into 3.0