Merge remote-tracking branch 'origin/master'

Conflicts:
	Exchange/src/ModelClasses/User.java
	Exchange/src/dbClasses/DBqueryGenerator.java
dzaan zedapiruli homepage