Allow @extends to have a type param
Merge branch 'fix-extends' into fork

Conflicts:
	doctrine.js