Daily update (2014-7-24)
Merge remote-tracking branch 'origin/master'

Conflicts:
	arch/网络游戏解决方案.mmap
Revert "Daily update (2014-7-24)"

This reverts commit f1b5ace3505f514c7572675ea46cb4966f1fec02.