Merge branch 'SKYNET-29'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
We don't need to slow it down
Merge branch 'develop'
Resolved merge conflicts
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/ICRAR/boinc-magphys
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'