basic implementation of swapping and borrowing
basic implementation of swapping and borrowing
swappable and borrowable are now commendations and can be searched
swappable and borrowable are now commendations and can be searched
Merge branch 'develop' into feature-borrow
Merge branch 'develop' into feature-borrow
Merge branch 'develop' into feature-borrow
Merge branch 'develop' into feature-borrow
implement comments for articles
implement comments for articles
Merge branch 'feature-borrow' of github.com:fairnopoly/fairnopoly into feature-borrow
Merge branch 'develop' into feature-borrow

Conflicts:
	app/assets/stylesheets/controller/articles.css.scss
	app/helpers/articles_helper.rb
	app/views/articles/show/_article_contents.html.haml
	db/schema.rb
Merge branch 'develop' into feature-borrow
articles are not commentable when the seller is on vacation
Merge branch 'develop' into feature-borrow
comment mail l16n and comment improvements
fix test suite (actual mail bug)
Merge branch 'develop' into feature-borrow
Merge branch 'develop' into feature-borrow
commendation label improvements