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
Add the php files to put in remote server. Export to external DB works now (with better checks of the real execution of the SQL on server) and maxId method works to
Put in static the maxId method
Adding the auto implmentation of the elementType and Material.
Merge pull request #63 from gab-y/dev

Bug fixes :
Corection of the size of the buttons in the ZoneFragments.
Fix merge.
Image is now sended to the server when external sync is requested. Not intelligent for now (upload every time when one time is neccesary)
Merge branch 'dev' of https://github.com/Mendroyxx/FeatureApp into SynchroExt
Fix minor problems in the code.
Merge pull request #65 from SebastienCohendet/SynchroExt

Synchro ext of picture
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
Correction of a crash after a suppresion of polygon splited after draw.
Implementation of the function to completly load local projects.
Revert "Image is now sended to the server when external sync is requested. Not intelligent for now (upload every time when one time is neccesary)"

This reverts commit 4ca081e400f96250fa68957fd9262d1a652e1d87.

t
Correction of the update request when saving an existing project.