Some changes
Merge branch 'master' of https://github.com/arjunswaj/facebook

Conflicts:
	project/WebContent/META-INF/context.xml