Merge origin/master

Conflicts:
	src/scheduleplanner/Client.java