add more parameters for set_expire_date OCS action
Merge branch 'master' of http://github.com/teeple/pc_dev
update