Merge commit 'e865fc9bbf7dad496635e16f4b11884ce2c01fd2' into 7.x-stable
Updated Drupal core to latest version
updated dhtmlx gantt library to version 2.1.1
Merge branch '7.x-2.x' of git.drupal.org:project/erpal into 7.x-2.x
Merge commit '43992cdc1392606f5ae0856e8035e3d3171e5631' into 7.x-stable