demo update 20Nov
Merge branch 'master' of https://github.com/inlightayatas/inlightnew

Conflicts:
	protected/runtime/application.log
	protected/views/menu/admin.php
	themes/inlight/css/custom.css