Initial commit
primer diagrama de casos us
add include and extend in the use case diagram
add mockup
add icon
afegit esquema d'implementació
modificat esquema implementació
aplication analisy
initial realese
diagram uses image
initial db definition
adding MapActivity class and moving code that generate map from
MainActivity to MapActivity
Merge branch 'master' of https://github.com/enavar/UlisesMap.git
adding MapActivity class and moving code that generate map from
MainActivity to MapActivity
Add comments to MapActivity
Add activity_login and activity_menu. Modificated AndroidManifest.
Merge branch 'master' of https://github.com/enavar/UlisesMap.git

Conflicts:
	UlisesMapAndroidClient/src/org/escoladeltreball/ulisesmap/MainActivity.java
Modificated class activity_login
adding activity and xml for show points of Interest
Merge branch 'master' of https://github.com/enavar/UlisesMap.git