V2.1

This branch will contain all of the changes made for BoatCraft version 2.1