notation
am ip
Merge branch 'master' of https://github.com/lguibert/projetAndroid.git

Conflicts:
	res/layout/activity_focus_show.xml
	src/com/exiapps/puydufou/model/AbstractManager.java
	src/com/exiapps/puydufou/view/FocusShowActivity.java