updated app controller and view
Merge branch 'master' of https://github.com/liorrm/vacationator