Changes done on 05/11/2014
Merge branch 'master' of https://github.com/inlightayatas/inlight

Conflicts:
	protected/runtime/application.log
	themes/inlightuser/views/layouts/front.php