Merge pull request #41 from felguerez/development

Development
users can now add profile photos.
fixes calendars
unifies h1 font-size
adds basic validation to start/end
Merge branch 'development' of https://github.com/felguerez/aircycle into listing_page
Merge pull request #124 from felguerez/account_profile

User Account: breaks JS templates into 'header' templates and rendering templates.
Merge branch 'development' of https://github.com/felguerez/aircycle into listing_page
Merge pull request #125 from felguerez/listing_page

fixes calendars and styling, basic validation start & end dates
Merge branch 'development' of https://github.com/felguerez/aircycle into development

Conflicts:
	lib/air_cycle/db/orm.rb
	web/app/controllers/users_controller.rb
	web/app/views/users/_vitals.html.erb
Merged development into my branch. Add 'bio' to User Account form
Merge branch 'development' of http://github.com/felguerez/gear2peer into account_profile
updates the city.
prof photo is set up in listing page
safeguards the city assignment
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 pull request #127 from felguerez/development

Development Merge!!
Merge branch 'development' of https://github.com/felguerez/aircycle into development

Conflicts:
	web/app/controllers/users_controller.rb
Merge pull request #128 from felguerez/development

user profile picture
Merge branch 'master' of http://github.com/felguerez/gear2peer into account_profile
Updates to User Account section styling. Moves Image Upload to the left-hand 'vitals' rail