Merge branch 'master' of https://github.com/cip123/incubator107

Conflicts:
	lib/tasks/facebook.rake
Merge branch 'master' of https://github.com/cip123/incubator107