Merge origin/master

Conflicts:
	Testing/Backend/UserAccountTest.java