Added User Dashboard data
Merge branch 'master' of github.com:eswaraj/platform

Conflicts:
	web/src/main/webapp/WEB-INF/jsps/user.jsp
Merge branch 'master' of github.com:eswaraj/platform