Merge commit Tag 2.0 'db5395ddbc4aef485415408720dd09cfc215b527' into add-features-to-ldapauth

Conflicts:
	src/main/twirl/account/edit.scala.html

src/main/scala/util/JGitUtil.scala

@@ -372,7 +372,12 @@ object JGitUtil {
 
       if(commits.length >= 2){
         // not initial commit
-        val oldCommit = commits(1)
+        val oldCommit = if(revCommit.getParentCount >= 2) {
+          // merge commit
+          revCommit.getParents.head
+        } else {
+          commits(1)
+        }
         (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))
 
       } else {