Merge origin/master

Conflicts:
	src/java/DAO/TransactionDAO.java