fixing merge conflicts
Merge pull request #98 from felguerez/reservation_calendar

Adds Get Res By Lid Query to InMem & ORM
Switches to ORM. Refactors ORM.db, lots of use cases.

User listing page now uses JavaScript for a 'single page effect'
Adds message expansion functionality.
Adds a stock welcome message upon user signup.
Fixes database issues re: loading ORM vs In Memory database.
Merge branch 'user_profile_ajax' into development

Conflicts:
	db/schema.rb
	lib/air_cycle.rb
	lib/air_cycle/db/orm.rb
	web/app/assets/stylesheets/application.css.scss
	web/app/views/users/show.html.erb
Styles the message reply form.
updates messages javascript
Switches database to ORM postgresql from InMemory.
Fixes add_photo use case tests
Merge pull request #100 from felguerez/add_photo

Add photo
Merge branch 'development' of https://github.com/felguerez/aircycle into messages

Conflicts:
	lib/air_cycle.rb
	web/app/assets/stylesheets/application.css.scss
	web/app/assets/stylesheets/listings.css.scss
Merge pull request #102 from felguerez/messages

Messages
Merge branch 'development' of https://github.com/felguerez/aircycle into reservation_calendar

Conflicts:
	lib/air_cycle.rb
	spec/db/shared_spec.rb
	web/Gemfile