Merge branch 'dev'

Conflicts:
	php/include/dal.php