maked code more readable, bugfix and improvement in views
Merge branch 'master' of git@github.com:ehotel/ehotel.git