Merge acl-var into develop

Conflicts:
	mod/settings.php

diff --cc include/acl_selectors.php
Simple merge

diff --cc mod/display.php
Simple merge

diff --cc mod/photos.php
Simple merge

diff --cc mod/settings.php
Simple merge