Discipline Entity, DAO, refactor
Bug Discipline Entity, DAO, refactor
Merge origin/develop into develop