Fix merge issue that removed all staff from developer branch :-).
Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..
Merge branch 'develop' into issue-957
Conflicts: application/controllers/members.php
refs #957: "I'm older than x years" checkbox is only shown on self-register page
ref #957: Birthday is not required
refs #988: Added support for onetime passwords
refs #864: Fixes C&P Jeff error :-) and improves label of registration form link from applicants member and hide link when self-registration is disabled.
refs #864: Improved label of registration form link from applicants grid.
refs #908: Fixed brutal error (creating controller in controller)
refs #864: Register applicant button on show all applicants page
refs #864: Changed text label for registering applicants by administrator
Merge from SVN branch 1.2.
Release 1.1.12
Release 1.1.10
Release 1.1.6
Release 1.1.0
Release 1.0.12
Release 1.0.0