Modify id in rss feed to pad to 36 chars and omit unnecessary urn:uuid: prefix
Merge branch 'master' of github.com:SkyTruth/alerts

Conflicts:
	html/api/templates/feed.rss.template