infos
Merge branch 'master' of https://github.com/lguibert/projetAndroid.git

Conflicts:
	src/com/exiapps/puydufou/view/FocusShowActivity.java
Merge branch 'master' of https://github.com/lguibert/projetAndroid.git
Merge branch 'master' of https://github.com/lguibert/projetAndroid.git