testing again.
Merge branch 'master' of https://github.com/Peksu/VaadinFeedReader.git

Conflicts:
	VaadinFeedReader/src/com/vaadinfeedreader/ui/VaadinfeedreaderUI.java
test