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

Conflicts:
	Polyjoule/src/com/example/polyjoule/news/NewsDetailFragment.java