Merge branch 'master' into feature-tasklist

Conflicts:
	src/main/twirl/issues/commentform.scala.html
	src/main/twirl/issues/create.scala.html
	src/main/twirl/pulls/compare.scala.html
	src/main/twirl/wiki/edit.scala.html

src/main/twirl/helper/preview.scala.html

@@ -3,7 +3,7 @@
 @import context._
 @import view.helpers._
 <div class="tabbable">
-  <ul class="nav nav-tabs">
+  <ul class="nav nav-tabs" style="height: 37px;">
     <li class="active"><a href="#tab1" data-toggle="tab">Write</a></li>
     <li><a href="#tab2" data-toggle="tab" id="preview">Preview</a></li>
   </ul>