merge star
discussion remove empty page bug and My course discussion pagination bug