added user profile
Merge branch 'master' of https://github.com/Live-Oak/FlipKartProject

Conflicts:
	WebContent/Admin-ProductEntry.jsp
	src/edu/iiitb/action/FetchDatabaseInfo.java
parush changes
Merge branch 'master' of https://github.com/Live-Oak/FlipKartProject
parush changes
changes from parush