fixed merge issue
added city, shelter and creator email to list of stories in index
added filter for viewable shelters based on user id

this is a place holder only since we don't currently have access to a
user's role to determine whether to filter it or not
Merge branch 'davebranch'

Conflicts:
	protected/controllers/ShelterController.php