resolve merge issues
resolve merge issues

weswigham/TypeScript,mihailik/TypeScript,kitsonk/TypeScript,kitsonk/TypeScript,synaptek/TypeScript,synaptek/TypeScript,alexeagle/TypeScript,kpreisser/TypeScript,jeremyepling/TypeScript,SaschaNaz/TypeScript,erikmcc/TypeScript,microsoft/TypeScript,mihailik/TypeScript,alexeagle/TypeScript,thr0w/Thr0wScript,RyanCavanaugh/TypeScript,synaptek/TypeScript,DLehenbauer/TypeScript,donaldpipowitch/TypeScript,basarat/TypeScript,erikmcc/TypeScript,minestarks/TypeScript,mihailik/TypeScript,Microsoft/TypeScript,jeremyepling/TypeScript,Microsoft/TypeScript,TukekeSoft/TypeScript,kitsonk/TypeScript,thr0w/Thr0wScript,weswigham/TypeScript,basarat/TypeScript,Eyas/TypeScript,minestarks/TypeScript,nojvek/TypeScript,erikmcc/TypeScript,donaldpipowitch/TypeScript,Eyas/TypeScript,donaldpipowitch/TypeScript,minestarks/TypeScript,kpreisser/TypeScript,nojvek/TypeScript,nojvek/TypeScript,microsoft/TypeScript,kpreisser/TypeScript,DLehenbauer/TypeScript,RyanCavanaugh/TypeScript,thr0w/Thr0wScript,SaschaNaz/TypeScript,weswigham/TypeScript,basarat/TypeScript,basarat/TypeScript,Microsoft/TypeScript,microsoft/TypeScript,TukekeSoft/TypeScript,chuckjaz/TypeScript,SaschaNaz/TypeScript,jwbay/TypeScript,thr0w/Thr0wScript,chuckjaz/TypeScript,TukekeSoft/TypeScript,nojvek/TypeScript,RyanCavanaugh/TypeScript,donaldpipowitch/TypeScript,chuckjaz/TypeScript,synaptek/TypeScript,jeremyepling/TypeScript,chuckjaz/TypeScript,alexeagle/TypeScript,SaschaNaz/TypeScript,erikmcc/TypeScript,DLehenbauer/TypeScript,jwbay/TypeScript,jwbay/TypeScript,Eyas/TypeScript,mihailik/TypeScript,jwbay/TypeScript,Eyas/TypeScript,DLehenbauer/TypeScript