added new patch for field conditional states
Merge branch '7.x-2.x' of git.drupal.org:project/erpal into 7.x-2.x
Merge commit 'c64c3befee5918bfa798f67826ad3115f376b802' into 7.x-stable