mass_uploads now track status and are more robust
fix #830 - increase recursion level for categories by one
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fix travis error by increasing ruby version to latest stable
Merge branch 'develop' into feature-relayout

Conflicts:
	app/controllers/categories_controller.rb
	app/workers/process_row_mass_upload_worker.rb