[OES-142] show address and town when looking up contacts on the patient summary so we can easily differentiate between different sites.
Merge branch 'master' into hotfix/OES-142
[OE-3934] Fixed widths of macro dropdowns
Temporary cache bust
Cache buster for JS fix
Merge branch 'master' of github.com:openeyes/OpenEyes
remove temporary js fix
set autotest config authentication to BASIC by default
Re-enable .htaccess for protected
Merge branch 'master' into develop

Conflicts:
	css/style.css
	protected/config/local/common.autotest.php