mac_09071713_A

fix dropdown
Merge commit '61d72e4996c17ec57be5cb24a35c220fce33fd4e' into test

Conflicts:
	inc/user_admin.php