fixed merge conflict in page tpl
built dev directory for site development outside drupal