commits
Merge branch 'master' of https://github.com/inlightayatas/inlightnew

Conflicts:
	protected/extensions/import/behaviors/ImportBehavior.php
	protected/runtime/application.log