Recovery &  view updated.
Merge branch 'master' of https://github.com/abhishekwaichal/Twitter_API

Conflicts:
	WebContent/WEB-INF/root-context.xml
	WebContent/WEB-INF/web.xml
	src/com/tweet/controller/UserController.java
	src/com/tweet/dao/UserDaoImpl.java
	src/com/tweet/domain/UserInfo.java
	src/com/tweet/service/UserServiceImpl.java