Merge pull request #126 from felguerez/listing_page

City Assignment y Profile Photo Setup in Listing Page
user profile photos are now uploaded using ajax
Merge branch 'development' of https://github.com/felguerez/aircycle into development

Conflicts:
	web/app/controllers/users_controller.rb
adds h1 global style (1.7em)
adds profile photo to a listing page and to nav bar drop down