fixing some merge stuff from earlier
debugging & fixing stuff
Merge branch 'master' of github.com:wyrllyn/JEEproject
Merge branch 'master' of github.com:wyrllyn/JEEproject

Conflicts:
	src/controller/Management.java
dbi