Update: TransitionDayAction.java, PositionDAO.java, TransactionDAO.java
Merge conflict merge
Merge branch 'master' of https://github.com/basdag/08707