Fixed a subtle bug in the metamergestrategy causing value loss on a META<->META conflict
Added testvalues for ini
Added new simple strategies for modeling the existing import strategies
Changed the threewaymerge to also merge the parentkey
Changed the import command to use the merging framework #48, #52
Improved the help text of import
Fixed a merge conflict presentation bug
Fixed incorrect use of single line if
Fixed a critical bug in import and reenabled previously failing tests
Fixed a wrong return value in case of a merge conflict
Another try to fix the cut issue
Brings the merging framework to the import command.

Felix: I commented all the
side_value tests because i couldn't find this value in any testdata.

Merge branch 'kdb-import-merge' of https://github.com/fberlakovich/libelektra

Conflicts:
	tests/shell/check_import.sh
	tests/shell/shell/two_value.ini