Ajout de tout ce qui touche au calendrier
Merge branch 'master' of github.com:bsaleil/um2-android

Conflicts:
	Projet-android/bin/Projet-android.apk
	Projet-android/bin/classes.dex
	Projet-android/bin/classes/com/um2/android/Building.class
	Projet-android/bin/classes/com/um2/android/CustomMapActivity$1.class
	Projet-android/bin/classes/com/um2/android/CustomMapActivity$2.class
	Projet-android/bin/classes/com/um2/android/CustomMapActivity$3.class
	Projet-android/bin/classes/com/um2/android/CustomMapActivity.class
	Projet-android/bin/classes/com/um2/android/R$string.class
	Projet-android/bin/classes/com/um2/android/R$style.class
	Projet-android/bin/classes/com/um2/android/R$xml.class
	Projet-android/bin/classes/com/um2/android/SettingsFragment.class
	Projet-android/bin/classes/com/um2/android/TabViewActivity$TabListener.class
	Projet-android/bin/classes/com/um2/android/TabViewActivity.class
	Projet-android/bin/resources.ap_
	Projet-android/res/values/strings.xml