cleanup
Merge branch 'develop'

Conflicts:
	@Resources/Scripts/FeedReader/Parser.lua