file tree printed
navigating to the line of items.xml file works
navigating to the line of items.xml file works
Merge remote-tracking branch 'origin/master'

Conflicts:
	META-INF/plugin.xml
navigating to the line of items.xml file works