Merge branch 'feature-comments' into 2.5

Conflicts:
	.idea/compiler.xml
	.idea/modules.xml
	android-news-app/AndroidManifest.xml
	android-news-app/android-news-app.iml
	android-news-app/project.properties
	android-news-app/src/com/guardian/model/Article.java