add a documentation server diagram
Merge branch 'master' of https://github.com/enavar/UlisesMap.git

Conflicts:
	UlisesMapAndroidClient/src/org/escoladeltreball/ulisesmap/activities/UlisesActivity.java