add merge articles functionality
fix some tests for the grader
fix grader
fix categories admin view