Updates
Reconcile versions

Merge branch 'master' of https://github.com/petrbouchal/Charting-government

Conflicts:
	charts/ACSES chart objects/plot_AgeYr.ggp
	charts/ACSES chart objects/plot_DisabGrYr.ggp
	charts/ACSES charts/plot_AgeYr.wmf
	src/acses_chart_AgeYr.R
	src/acses_chart_DisabGrYr.R