Commit in order to merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	sveditor/features/net.sf.sveditor.svt.feature/build.properties
	sveditor/features/net.sf.sveditor.ui.feature/build.properties
	sveditor/plugins/net.sf.sveditor.svt.core/build.properties
	sveditor/plugins/net.sf.sveditor.svt.editor/build.properties
	sveditor/plugins/net.sf.sveditor.svt.ui/build.properties
Merge pull request #234 from mballance-sf/master

Merge updates and bugfix