Merged messages listing and message thread pages
Merge branch 'master' of https://github.com/arjunswaj/facebook.git

Conflicts:
	project/WebContent/WEB-INF/tiles.xml