updated idea node panel
fixed conflicts
Merge branch '7.x-2.x' of git.drupal.org:project/idea into 7.x-2.x