Merge remote-tracking branch 'upstream/master' into anon-access

Conflicts:
	src/main/scala/app/SystemSettingsController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/test/scala/view/AvatarImageProviderSpec.scala

src/main/scala/servlet/AutoUpdateListener.scala

@@ -52,6 +52,7 @@ object AutoUpdate {
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
+    new Version(2, 8),
     new Version(2, 7) {
       override def update(conn: Connection): Unit = {
         super.update(conn)