merge
Merge branch 'master' of github.com:neemem/m.cad.com.cn

Conflicts:
	protected/viewc/admin/footer.php
finished article page