sync
[Pman.Admin] / Pman.Dialog.AdminEnumType.bjs~
2015-01-26 Michealfix conflict
2015-01-26 Michealpulldown js error