* adjust the style of company module.
 * adjust the style of article module.
Merge branch 'master' of github.com:xirang/xirangeps

Conflicts:
	module/article/view/browse.html.php