' is replaced with &apos;
" is replaced with &quot;
remove test log
Merge branch 'master' into development
added HotelBaseService for testing