Merge remote-tracking branch 'origin/master' into TD_mazab
Tmp1
Sync
featureCategories
Merge remote-tracking branch 'origin/master' into TD_noy

Conflicts:
	DBProject/src/edu/umich/td/fextractors/Feature.java