Integrating into YII app
Merge pull request #5 from rominawnc/yiiAndCollisions

Integrating into YII app