Fixes and improvements

Removed scape characters from the regex.
If the type of var is a custom type "com.package.Component" now only
imports "Component" as a type..
If the type is a include tag import it as a View