Clean up
Merge branch 'master' of github.com:minglu/FacebookDataIntegration

Conflicts:
	src/org/my/facebookalgorithm/facade/Facade.java