Fixed the PHP warnings.
Merge branch 'develop' of github.com:pandorafms/pandorafms into develop