Merge test
Merge branch 'master' of https://github.com/adefarge/android-agenda

Conflicts:
	src/com/insa/agenda/agenda/AgendaActivity.java
	src/com/insa/agenda/agenda/AgendaFragment.java