From2 - admin changes
Merge branch 'master' of https://github.com/nandor1992/Hotel-PolyHilton.git