merge
added on building complete listener
added toggleDebug to squadManager
merge conflicts