Fixing typo in documentation
Update documentation about amenities
Merge branch 'development'

Conflicts:
	app/views/hello.php