Merge branch 'feature/ken-work1' into develop
modify 2013-03-10 13:47:03 by KEN-WORK1