Merge with baystation
Merge branch 'Baystation12-master' into BS12
Removing uneeded things.
Complie fixes & Map fix.
.int
Remove this backup
Merge pull request #216 from jamiedigweed/BS12

Bs12 merger