Update sakai_feature.txt sakai
Merge branch 'release/1.0.5' into develop
Merge branch 'develop' of https://github.com/newface2013/git-learning into develop