Merge branch 'RSS-feed' of https://github.com/dazine/Charitymaps into RSS-feed

Conflicts:
	project.properties
permissions