""
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sveditor/plugins/net.sf.sveditor.vhdl.core/src/net/sf/sveditor/vhdl/core/db/index/VhdlArgFileIndex.java
Merge remote-tracking branch 'upstream/master'
- #(280) - Correct an issue with the order in which editors checked the
type 
  of the editor input. The fix results in improved support for nested
projects
  and linked resources, where the same physical resource may be linked
into
  multiple projects.
Merge pull request #263 from mballance-sf/master

Correct an issue with editor-input type resolution order