cherrypicked parallels test
cherrypicked parallels test
added spec rake task
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
Refactor mass-upload activate
fixed #369
modified tests for #369
Merged Branches
#336 fix
fixed tests
Hotfix for image uploads
Merge branch 'release' into develop
Fix merge conflicts
Refactor accordion anchor link to make them more general useful
Simplify render in views
Cleanup
Merge branch 'develop' into mass-upload
Add notices and refactoring