first implementation of feedback captchas (unfinished)
Merge branch 'develop' into feature-feedback-captcha
ruby changed to 2.1.0
added attribute specs for user and transaction model
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
added memcached
added schema.rb for travis
Merge branch 'master' into develop
added schema.rb
updated travis yml to reflect ruby version
session store is in dalli now
reverted session store to ar due to failoverpolicy
caching search form
added some more attribute specs for models
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Merge branch 'master' into develop
fixed test
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fixed specs
caching and factory girl gemfile fix