Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/backend/FileServiceImpl.class
	bin/backend/User.class