timers
Merge branch 'master' of https://github.com/Jackalex36/infmobile_android_tp2

Conflicts:
	Parky/src/com/tp2/Parky/Map.java
	Parky/src/com/tp2/Parky/MarkerManager.java