Add features (additional filter condition / disable mail resolve) to LDAP authentication.
Sync upstream/maste to master and Merge branch 'master' into add-features-to-ldapauth

Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/main/twirl/admin/system.scala.html
Revert line separator from LF to CRLF
Merge branch 'master' into add-features-to-ldapauth
Revert unnecessary format changes.
Merge branch 'master' into add-features-to-ldapauth
Modify wrong label of "Additional filter condition" label in system settings page
Merge branch 'master' into add-features-to-ldapauth
Change trigger of "Disalbe mail resolve is enalbed" from "When system settings check-box is ON" to "When mail attribute is empty".
Merge branch 'master' into add-features-to-ldapauth
Merge branch 'master' into add-features-to-ldapauth

Conflicts:
	src/main/twirl/account/edit.scala.html
Merge commit '5317ac5e031a29438657952fb882532af296135b' (tag 1.12) into add-features-to-ldapauth
Merge commit Tag 1.13 ('3e82534c78a72e17dd3b79e091521d75cb4d3855') into add-features-to-ldapauth

Conflicts:
	src/main/scala/service/AccountService.scala
	src/main/scala/util/LDAPUtil.scala
Merge commit Tag 2.0 'db5395ddbc4aef485415408720dd09cfc215b527' into add-features-to-ldapauth

Conflicts:
	src/main/twirl/account/edit.scala.html
(refs #378)Closed but not merged pull requests should be re-openable
(refs #378)"Delete branch" button is displayed for only merged pull requests
Add a badge which shows number of pages
Fix nested tags.
Merge pull request #390 from sakapoko/navform

Fix nested tags.
(refs #32)First impression of the plugin system