Merge pull request #259 from mballance-sf/master

Bug fixes and content-assist enhancements
Added comments to keep track of debug work done on bug 280.
Merge pull request #261 from mballance-sf/master

- #(284) - Ensure that 'pre-formatted' portions of NaturalDocs comments
""
""
Merge remote-tracking branch 'origin/master'
""
Merge pull request #262 from mballance-sf/master

Bug fixes for #286 and #287
""
Update for 1.4.6
""
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 branch 'master' of git://github.com/stevenaz/sveditor into stevenaz-master

Conflicts:
	sveditor/plugins/net.sf.sveditor.ui/src/net/sf/sveditor/ui/argfile/editor/SVArgFileEditor.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.