Fix terra and aqua templates for the dual gain channels (13 & 14)
Merge branch 'pre-master' of https://github.com/mraspaud/mpop into pre-master
Merge branch 'pre-master' of https://github.com/mraspaud/mpop into pre-master
Merge branch 'pre-master' of https://github.com/mraspaud/mpop into pre-master
Merge branch 'pre-master' of https://github.com/mraspaud/mpop into pre-master