Change-Id: Ia6bd4f7c146c6e3a9eb8fa03d3d176399c21de29
Change-Id: I3f23913b363286a6ae0e32aff5a668bf61a185dc
Change-Id: I37e2f9570044ac7a27bdb44c535cc2327f3a51c2
Change-Id: Ie016a4062e2bb01e249929702a508edaeca2cba4
Change-Id: Ifebb7e755ddb832eac1412f362e4ad48c8db432b
update
remove
update
update
update
Merge branch 'master' of https://github.com/doudou2012/ddpms

Conflicts:
	Admin/Conf/config.php
	Admin/Conf/routes.php
	Admin/Lib/Action/IndexAction.class.php
	Admin/Lib/Action/PinyinAction.class.php
	Admin/Runtime/Cache/f12c0a77906a0f355c95666536d66c0f.php
	Admin/Tpl/Index/index.html
	index.php
delete
delete file
update
Change-Id: Ia8f55e571a1188b4db0deeb4693294d25b9ce409
Change-Id: I924d569ebd9dbffd6ba1dcb6a4dd6249867f2568
update
update