Adding login functionalities based on user role.
Fixing the conflicts.

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

Conflicts:
	app/Controller/AppController.php
	app/Controller/UsersController.php
	app/Model/User.php
	app/View/Users/index.ctp
	app/View/Users/login.ctp