ProjectSettings + ErrorHandler
Merge remote-tracking branch 'origin/master'

Conflicts:
	FBCrawler2/src/fb/crawler/controller/FBCrawler.java