refactored mass_upload to use has_many through with articles
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop