Fix for aas_addcontrast; empty contrast structure was incorrect
Merge branch 'devel-share' of github:rhodricusack/automaticanalysis into devel-share
Changes from Conor