test
test
test
Merge branch 'Clean'

Conflicts:
	VaadinFeedReader/build/classes/com/vaadinfeedreader/ui/VaadinfeedreaderUI.class