Make user group and doc group overlap test more forgiving.
Merge branch 'master' of heroku.com:annotationstudio
Reintegrate redactor-rails, after gem upgrade, to test on staging.
Add generated models and up loaders.
Rerun redactor generator.
Add carrier wave and its dependencies.
Add carrier wave, just to get redactor working.
Update assigned document count.
Fix assigned document count again.