Update Controller and Router
Merge branch 'master' of https://github.com/Phamnuven/CS.Framework
Update Controller and Router