support for one custom import and one include, via meta
Update to svn version and some mass replace for extends keyword