added new changes..
Merge branch 'master' of https://github.com/vasuki20/estd_new

just commited by removing conflict

Conflicts:
	app/Config/database.php
	app/View/Users/index.ctp
added uploadimage controller, view and featuredimage cotroller modfied