Merge branch 'master' of https://github.com/dutu/xMon into xMon

Conflicts:
	.gitignore