Update, deletefrom in query builder
Merge branch 'master' of https://github.com/Distribuerede-systemer/server

Conflicts:
	src/model/database/DatabaseInit.java