q
Merge branch 'dev' of https://github.com/Nigui/PolyGit.git into dev

Conflicts:
	Polyjoule/AndroidManifest.xml
	Polyjoule/bin/AndroidManifest.xml
	Polyjoule/bin/classes/com/example/polyjoule/news/NewsActivity.class
	Polyjoule/gen/com/example/polyjoule/R.java
	Polyjoule/project.properties
	Polyjoule/src/com/example/polyjoule/news/NewsActivity.java
	Polyjoule/src/com/example/polyjoule/partenaires/PartenaireListeActivity.java