Updates for CI, CakePHP and Yii

Stanislav-Wolski released this16 Jun 13:19

· 20 commits to master since this release

2.2.0

03c20c4

Merge remote-tracking branch 'origin/master'

Conflicts:
	codebase/combo_connector.php