version20140506

regist
Merge branch 'master' of https://github.com/nonight89/ChloePJ