Improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/managers/CategoryDAO.java
Improvements