Erreur commit
Merge branch 'dev' of https://github.com/Nigui/PolyGit into dev

Conflicts:
	Polyjoule/bin/classes/com/example/polyjoule/R$id.class
	Polyjoule/bin/classes/com/example/polyjoule/R$layout.class
	Polyjoule/bin/classes/com/example/polyjoule/R$menu.class
	Polyjoule/bin/classes/com/example/polyjoule/R$string.class
	Polyjoule/bin/classes/com/example/polyjoule/R$style.class
	Polyjoule/bin/classes/com/example/polyjoule/news/NewsActivity.class
	Polyjoule/bin/classes/com/example/polyjoule/news/NewsAdapter.class
	Polyjoule/bin/classes/com/example/polyjoule/news/NewsDetailActivity.class
	Polyjoule/gen/com/example/polyjoule/R.java
Merge branch 'dev' of https://github.com/Nigui/PolyGit into dev

Conflicts:
	Polyjoule/project.properties
bug pull
merge
Merge branch 'dev' of https://github.com/Nigui/PolyGit into dev

Conflicts:
	Polyjoule/bin/AndroidManifest.xml
	Polyjoule/bin/classes/com/example/polyjoule/R$drawable.class
	Polyjoule/bin/classes/com/example/polyjoule/news/NewsActivity.class
	Polyjoule/bin/dexedLibs/android-smart-image-view-1.0.0-ad7e5bb053855734276a7e076aba9269.jar
	Polyjoule/gen/com/example/polyjoule/R.java
	Polyjoule/project.properties
Modification fragement_course