qwer
Merge remote-tracking branch 'origin/master'

Conflicts:
	FBAdapter/src/fb/adapter/model/reader/Reader.java