version 5
Merge branch 'master' of https://github.com/catdiop/Miniflux_Android

Conflicts:
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/projet/miniflux/R$id.class
	bin/classes/com/projet/miniflux/R$layout.class
	bin/classes/com/projet/miniflux/R$menu.class
	bin/classes/com/projet/miniflux/R$raw.class
	bin/classes/com/projet/miniflux/R$string.class
	bin/classes/com/projet/miniflux/R$style.class
	bin/classes/enseirb/t2/miniflux/SubscriptionActivity.class
	bin/resources.ap_
	src/enseirb/t2/miniflux/ItemActivity.java
	src/enseirb/t2/miniflux/ListItemAdapter.java
	src/enseirb/t2/miniflux/SubscriptionActivity.java