Added test for line plugin
Merge in new mergecode.

Merge branch 'master' of github.com:easyxtarget/libelektra
Added test for line plugin