xindom management
Merge branch 'master' of https://github.com/BloodM/xindom
Conflicts:
	static/others/js/login.js
	static/others/js/register.js