master并给siweiwei
Merge branch 'siweiwei' of https://github.com/richardgong1987/Mitsubishi into siweiwei

Conflicts:
	js/config.js