pre dev-technology deployment work

Signed-off-by: Callum Macdonald <callum@redevolution.com>
Merge branch 'master' of https://github.com/callummac88/grampianemeraldcsc