homepage done
Merge remote-tracking branch 'origin/master'

Conflicts:
	hotel_home/install.php