almost finished
almost finished
Merge origin/master

Conflicts:
	rsstumblr.php