added new values for import-script, changed minor things on template
Merge branch 'master' of git@github.com:ehotel/ehotel.git