Merge branch 'master' into develop

Conflicts:
	assets/sass-assets/.sass-cache/168202d080b8a6b037472c23c0e58945790b3115/_typeplate.scssc
	assets/sass-assets/.sass-cache/168202d080b8a6b037472c23c0e58945790b3115/_vars-typeplate.scssc
	assets/sass-assets/.sass-cache/338799cc09af4a2ae3f19270c80b058c14adf936/styles.scssc
	assets/sass-assets/.sass-cache/cd40e44d077e05781c9e23ef15f71d8eff90d71e/foundation-icons.cssc
Merge branch 'develop' of https://github.com/RufusMbugua/program-monitor into develop

Conflicts:
	assets/sass-assets/.sass-cache/338799cc09af4a2ae3f19270c80b058c14adf936/styles.scssc