kepler changes
Merge branch 'master' of github.com:lhein/fuseide

Conflicts:
	plugins/org.fusesource.ide.camel.editor/src/org/fusesource/ide/camel/editor/editor/RiderDesignEditor.java