Merge branch 'master' of https://github.com/mgrush/WhiteNight

Conflicts:
	index.php
测试

测试i
conflict

conflict