avoiding some warnings
recovering palmweb template.php from broken merge and reintregrate
copy drupal7 dataportal themes into trunk