Cleaned up the Database controller. Database getList method is now
a little more robust. It handles errors cleaner. Also added a method
for getHotelInfo. Will continue to implement this. It currently only
returns the size of the Amenities list to the view.
Merge remote-tracking branch 'origin/zach_branch' into caleb_branch

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb