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

Conflicts:
	project/WebContent/WEB-INF/tiles.xml
	project/src/struts.xml
Timeline changes
Merge branch 'master' of https://github.com/arjunswaj/facebook.git
context.xml changes