Rollback word consistencty over entire codebase (ref. #139).
Merge branch 'master' of github.com:yiisoft/yii2