commit to merge upstream master
commit to merge upstream master

MichaelaLeung/2016-Stronghold,Spartronics4915/2016-Stronghold,MichaelaLeung/2016-Stronghold,Spartronics4915/2016-Stronghold,dbadb/2016-Stronghold,AlexCook75921312312312/2016-Stronghold,MichaelaLeung/2016-Stronghold,schmirob000/2016-Stronghold,AlexCook75921312312312/2016-Stronghold,dbadb/2016-Stronghold,schmirob000/2016-Stronghold,AlexCook75921312312312/2016-Stronghold,dbadb/2016-Stronghold,Spartronics4915/2016-Stronghold,AlexCook75921312312312/2016-Stronghold,dbadb/2016-Stronghold,schmirob000/2016-Stronghold,schmirob000/2016-Stronghold,MichaelaLeung/2016-Stronghold,Spartronics4915/2016-Stronghold