Rebase on master
Rebase on master

-Messed up part of the merge for _form.html.haml
-Probably need discussion about what the new/edit merge page should look like now that it involves projects

Change-Id: I77f3a12ab979578fb4420e0fac6e8bf3fd451fe1

inetfuture/gitlab-tweak,inetfuture/gitlab-tweak,inetfuture/gitlab-tweak