Setting compiler back to official typescript's
tslint fixes
compiler fixes
Merge branch 'upgradeFixes' into protected