Server commit!
Merge branch 'master' of http://github.com/franciskung/iati_reporting_frequencies

Conflicts:
	www/js/showpulse.js