* add blog module.
Merge branch 'master' of github.com:xirang/xirangeps

Conflicts:
	system/module/article/control.php