Revert "3 commit"

This reverts commit c30cd9b95289ad05c884221932435f92fda53d91.
Merge branch 'six' of https://github.com/Alucard1313/YiiSite into six