test
Merge remote-tracking branch 'origin/master' into TD_noy
Merge remote-tracking branch 'origin/TD_mazab' into TD_noy
python + plan extractor class
feature class
Merge remote-tracking branch 'origin/master' into TD_noy

Conflicts:
	DBProject/src/edu/umich/td/fextractors/Feature.java
changes/updates:
-- Feature.java (changed the to_string)
-- FeatureCategory.java (removed useless categories)
-- QPlanFeatureExtractor.java 
new files:
-- XMLHandler.java
-- files/featureNames.csv
-- files/FeatureNamesNums.csv
-- files/plan.xml
new files:
-- XMLHandler.java
-- files/featureNames.csv
-- files/FeatureNamesNums.csv
-- files/plan.xml
Merge remote-tracking branch 'origin/master' into TD_mazab

Conflicts:
	DBProject/bin/edu/umich/td/fextractors/QTextFeatureExtractor.class
	DBProject/src/edu/umich/td/fextractors/QTextFeatureExtractor.java