final update 7-11-2014
gitignore
Merge branch 'master' of https://github.com/inlightayatas/inlight

Conflicts:
	protected/controllers/MenuController.php
	protected/models/Menu.php
	protected/models/Pages.php
	protected/models/Users.php
	protected/views/menu/_form.php
	protected/views/menu/_search.php
	protected/views/menu/admin.php
	protected/views/menu/create.php
	protected/views/menu/update.php