ER-18
Merge branch 'master' of https://github.com/Herman90/ExclusiveResorts