Fixed some things
Merge branch 'master' of https://github.com/chemiker/ADNCC

Conflicts:
	api-1.1/array.php