Class list bug
Class list Academic for default
merge dev to fix class list