Update Feature1.java
Merge branch 'feature1'

Conflicts:
	feature1/src/com/ebay/platform/feature1/Feature1.java