HOTFIX: wrong function name
BUGFIX: don't redeclare class
Extend timeout on backend ajax calls from 1 second to 5 seconds
Merge branch 'master' into develop

Conflicts:
	pos/is4c-nf/install/extra_data.php