Merge branch 'master' of github.com:c-j-d/lineedit

Conflicts:
	libs/lineedit/lineeditUtils.h
Merge branch 'master' of github.com:c-j-d/lineedit