Fixed typos
Merging the lastest master
Add phrases controller
Merge cleanup