Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	src/test/java/LoginTest.java