fixed diploma marker
added saving user

update gps location to server
added comments
Merge branch 'development5' of https://github.com/fellou89/cop4331 into development5

Conflicts:
	bin/classes.dex
	bin/classes/com/example/pocket_monsters/EncounterService.class
	bin/classes/com/example/pocket_monsters/LocationTrackingService.class
	bin/classes/com/example/pocket_monsters/LoginActivity$1.class
	bin/classes/com/example/pocket_monsters/LoginActivity$2.class
	bin/classes/com/example/pocket_monsters/LoginActivity$Debug.class
	bin/classes/com/example/pocket_monsters/LoginActivity.class
	bin/classes/com/example/pocket_monsters/MapActivity.class
	bin/classes/com/example/pocket_monsters/MenuActivity$5.class
	bin/classes/com/example/pocket_monsters/MenuActivity$6.class
	bin/classes/com/example/pocket_monsters/MenuActivity$7.class

bin/classes/com/example/pocket_monsters/MenuActivity$IndexQuickListAdapt
er$1.class

bin/classes/com/example/pocket_monsters/MenuActivity$IndexQuickListAdapt
er.class

bin/classes/com/example/pocket_monsters/MenuActivity$NotificationQuickLi
stAdapter$1.class

bin/classes/com/example/pocket_monsters/MenuActivity$NotificationQuickLi
stAdapter.class
	bin/classes/com/example/pocket_monsters/MenuActivity.class
	bin/pocket_monsters.apk
	bin/resources.ap_
	src/com/example/pocket_monsters/LoginActivity.java
	src/com/example/pocket_monsters/MenuActivity.java