Merge branch 'master' of https://github.com/BruSD/NewsRssFeed

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml
Merge branch 'master' of https://github.com/BruSD/NewsRssFeed

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/newsrss/Feed/Article.java
	src/com/newsrss/Feed/XMLNewsType.java
Add Local DB