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
Implement atom feeds
Merge commit '5317ac5e031a29438657952fb882532af296135b' (tag 1.12) into add-features-to-ldapauth
Merge branch 'feedactivities' of https://github.com/kaakaa/gitbucket into kaakaa-feedactivities
(refs #327)Move feed.scala.xml to helper package because it breaks compilation by overriding xml package
(refs #327)Fix icon position for global recent activities feed
(refs #327)Add atom feed of the specified user
(refs #327)Fix baseURL and host in Context
Merge branch 'master' of https://github.com/takezoe/gitbucket
Display large icons at the user repository list page