Try to keep the type of the element when it is divised by an intersection.
Change the name of a file that prvents the merge.
Merge branch 'dev' of https://github.com/Mendroyxx/FeatureApp.git into UrbApp_dev

Conflicts were situated:
	Code/src/com/ecn/urbapp/zones/UtilCharacteristicsZone.java
Fix minor problems in the code.
Improve the addInMainActivityZones method to keep in memory the type of intersected zones.
Fix merge.
Merge branch 'dev' of https://github.com/Mendroyxx/FeatureApp into dev