location for 97 neighborhoods
Merge branch 'amsterdam-dev' into amsterdam

Conflicts:
	sql/test_data/data_location_amsterdam.sql
fixes to Facebook button
corrected the initial type of column invitee_email in project_invite table
fix typo
don't display "None" when no location is specified for the user
fix for HTML characters appearing in Resource tooltip
switched to both for S3 upload. Removed old library