Merge branch 'lane-pdo-connect'

Conflicts:
	pos/is4c-nf/ajax-callbacks/ajax-end.php
Merge branch 'master' into akt-master

Conflicts:
	pos/is4c-nf/ajax-callbacks/ajax-end.php
BUGFIX: Wrong function call; was mixed up upstream...
Merge branch 'master' into akt-master