incorporated the LDAP auth patch from v2.1.1
Merge branch 'master' into ldap_auth
implemented ldap auth methods.
improved code docs for ldap auth config settings.
Merge branch 'ldap_auth' into feat3615

Conflicts:
	web/application/config/default.ilios.php
upgraded to CodeIgniter v2.1.4. refs #3619
Merge pull request #143 from ucsflibtopfstedt/feat3619

upgraded to CodeIgniter v2.1.4
added logic to createUserAccount() action for handling password-less user account creation for LDAP authn. refs #3615
tabs to blankspace conversion.
pushing flag to the view indicating whether user passwords need to be captured in account management screens. refs #3615
added logic to omit user password capture when LDAP authn is turned on. refs #3615
Merge pull request #144 from ucsflibtopfstedt/feat3615

added LDAP authn method.
line-separator conversion from Win to *nix. replaced tabs with four blank spaces.
Merge pull request #145 from ucsflibtopfstedt/master

code cleanup: line ending conversion and tab conversion.
Merge branch 'master' into curriculum_inventory_export

Conflicts:
	web/application/config/default.ilios.php