- #(306) - Corrected a bug involving auto-indent of code templates when 
  preference settings cause spaces rather than tabs to be inserted.
  
- #(sr 10) - Add support for multiple content-assist contexts, which
allows
  code templates to be selected based on how the content begins as well
as
  the name associated with the code template.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sveditor/plugins/net.sf.sveditor.ui/plugin.xml
Merge pull request #280 from mballance-sf/master

Add support for multi-context content assist