Update FeedController text
Merge git://github.com/bercium/crowdrss
Merge
Merge git://github.com/bercium/crowdrss

Conflicts:
	protected/controllers/FeedController.php
Update FeedController