Lina, added database and preference support for punch status
Lina, merged conflict and added db