Makes the Generate new key link ajaxified
Merge branch 'develop' into issue-420

Conflicts:
	includes/feeds.php
Fix broken feeds
Merge pull request #421 from x-team/issue-420

Makes the Generate new key link ajaxified