Completed some work on GUI's
Merge branch 'master' of https://github.com/joshiejack/Mariculture.git