added new function and cutom file
Please enter the commit message for your changes. Lines starting
ded model blaclisy
creating new cakephp controller for movie injector.
resolving conflicts by checkoing out --ours.
Merge branch 'master' of https://github.com/vasuki20/cake

Conflicts:
	custom-projects/Config/database.php
	custom-projects/Controller/MovieparserController.php
	custom-projects/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	custom-projects/tmp/cache/persistent/myapp_cake_core_file_map
	custom-projects/tmp/cache/persistent/myapp_cake_core_method_cache
	nbproject/private/private.xml
	yoonic-cis-admin/Model/AdminRole.php
	yoonic-cis-lists/Controller/ListsController.php
	yoonic-cis-lists/Model/BlackList.php
	yoonic-cis-lists/tmp/cache/models/myapp_cake_model_default_registration_black_lists
	yoonic-cis-lists/tmp/cache/models/myapp_cake_model_default_registration_list
	yoonic-cis-lists/tmp/cache/models/myapp_cake_model_default_registration_white_lists
	yoonic-cis-lists/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	yoonic-cis-lists/tmp/cache/persistent/myapp_cake_core_default_en-us
	yoonic-cis-lists/tmp/cache/persistent/myapp_cake_core_file_map
	yoonic-cis-lists/tmp/cache/persistent/myapp_cake_core_method_cache
	yoonic-cis-lists/tmp/logs/debug.log
	yoonic-cis-lists/tmp/logs/error.log