add field street in madrid's points and london's points
overwritten by merge
merge conflict
Merge branch 'master' of https://github.com/enavar/UlisesMap
Merge branch 'master' of https://github.com/enavar/UlisesMap
add image upload
UlisesMapAndroidClient/res/drawable-hdpi/upload.gif
add message for user when datas incorrects
merge