#BC013 BS12 Master Merge

Merges BS12 Master into BayColony Master
* Removes Telescience
* Other fixes