!@#
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/newsrss/Feed/NewsRssActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
images and dates
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
commit after merge