fixing merge conflicts
Adds message expansion functionality.
Adds a stock welcome message upon user signup.
Styles the message reply form.
updates messages javascript
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