Aggregazione Grafica V4
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	HSA/res/layout/fragment_search.xml
	HSA/src/com/hsa/adapter/GraphicalAggregationAdapter.java
	HSA/src/com/hsa/contract/DeckEntry.java
	HSA/src/com/hsa/contract/FormationEntry.java