New file add
some change
Merge branch 'master' of https://github.com/Saro50/iivi

Conflicts:
	app/Controller/AdminController.php
	app/View/Home/index.ctp