deck data aggregation is ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	HSA/src/com/hsa/adapter/DeckDataAggregationAdapter.java