resolves conflict in Classes and Events tpl file
Merge branch 'development' of https://github.com/RCPL/RCPL-Drupal-7 into development