add a newfile
Add login class for xms
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore