removed headers, changed a lot of thins for the template
Merge branch 'master' of git@github.com:ehotel/ehotel.git