Merge branch 'master' of github.com:gpallotta/apartment_v2
Merge branch 'signup_email'
fix conflicts
add content to welcome email
add user_mailer unit test for body content
comments_controller#create now responds to html as well as json
refactor resetting of comment form on successful submission
implement handlebars for rendering new comment
remove tests for edit_link in comment_serializer_spec
increment comment counter using javascript
refactor claims.js comment creation to be a separate function
rename form variable to form_submitted
refactor claim.js showing search/claim form
refactor usage of templates in comment creation

- create app/templates directory
- create _comment.html.erb template
- yield this template in layout
- call template from this file
- move relevant javascript to template file
Add email-spec, refactor user_mailer unit test

- use email-spec in user_mailer_spec.rb
Remove unused javascript files

- files were in app/assets/javascripts
remove unused @greeting from user_mailer.rb
refactor welcome email acceptance tests to use email-spec
add style to welcome email

- development.rb now uses mailcatcher
add receives_weekly_email to users

- boolean, default by false