Fix a couple of PHP errors and warnings.
Merge branch 'development' of github.com:SeriaAS/Istribute-Drupal7 into development