faanbranch minor changes
Merge branch 'master' into faandg_branch

Conflicts:
	src/main/java/com/programmeren4/turnahead/server/database/DBConnector.java
update dao Location en Karakter
update LocationDAO  and LocationDTO
update locationDAO
DAOs
update DAO
update & test DAO
update dao
update DAO
update UserdataDAO
update dao
update dao
update DAO
update locationdao en karakterdao + Itemownership
Merge branch 'wardvandepeer85-dbranch' into faandg_branch

Conflicts:
	src/main/java/com/programmeren4/turnahead/server/model/dao/KarakterDataDao.java
	src/main/java/com/programmeren4/turnahead/server/model/dao/UserDataDao.java