updates on about
Merge branch 'master' of https://github.com/arjunswaj/facebook.git

Conflicts:
	project/WebContent/timeline/timeline.jsp
	project/src/edu/iiitb/facebook/action/dao/impl/UserDAOImpl.java
	project/src/edu/iiitb/facebook/action/timeline/TimelineAction.java
	project/src/struts.xml