Merge branch 'develop' into new_develop

Rolling back the refactoring of approve and ban actions
Yanked active_decorator and authority gem
Cleanup
Merge branch 'feature/remove_authority_and_active_decorator' into develop