Squashed commit of the following:

commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600

    Removed Upload stats as the upload table is just a temporary table

commit 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:42:41 2016 -0600

    Fix for CodeMirror mode

commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:03:33 2016 -0600

    Made tabbing in editor use spaces

commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:56:46 2016 -0600

    Fix for data-url

commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:42:53 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit 7fc8a89cb495478225b02d613e647f99a1489634
Merge: fd3d86c c03d040
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:40:00 2016 -0600

    Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file

commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:39:44 2016 -0600

    Code cleanup

commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 29 15:38:23 2016 -0600

    Code cleanup

commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:36:01 2016 -0600

    Code cleanup and fixes

commit c2895dc742f25f8412879c9fa15e18f27f42f194
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:24:04 2016 -0600

    Fixes per Unknwon's requests

commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef
Merge: 889e9fa ad7ea88
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 17:13:43 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	modules/setting/setting.go

commit 889e9faf1bd8559a4979c8f46005d488c1a234d4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:09:18 2016 -0600

    Fix in gogs.js

commit 47603edf223f147b114be65f3bd27bc1e88827a5
Merge: bb57912 cf85e9e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:07:36 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit bb5791255867a71c11a77b639db050ad09c597a4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:02:18 2016 -0600

    Update for using CodeMirror mode addon

commit d10d128c51039be19e2af9c66c63db66a9f2ec6d
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 16:12:57 2016 -0600

    Update for Edit

commit 34a34982025144e3225e389f7849eb6273c1d576
Merge: fa1b752 1c7dcdd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 11:52:02 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go

commit fa1b752be29cd455c5184ddac2ffe80b3489763e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 15 18:35:42 2016 -0600

    Feature for editing, creating, uploading and deleting files

7 files changed, 777 insertions, 4 deletions

diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index 00f30b0f13..453df3745e 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -5,8 +5,13 @@
 package repo
 
 import (
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/auth"
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/modules/log"
+	"net/url"
+	"strings"
 )
 
 const (
@@ -29,3 +34,53 @@ func Branches(ctx *context.Context) {
 	ctx.Data["Branches"] = brs
 	ctx.HTML(200, BRANCH)
 }
+
+func NewBranchPost(ctx *context.Context, form auth.NewBranchForm) {
+	oldBranchName := form.OldBranchName
+	branchName := form.BranchName
+
+	if ctx.HasError() || !ctx.Repo.IsWriter() || branchName == oldBranchName {
+		ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + oldBranchName))
+		return
+	}
+
+	branchName = url.QueryEscape(strings.Replace(strings.Trim(branchName, " "), " ", "-", -1))
+
+	if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil {
+		ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + branchName))
+		return
+	}
+
+	if err := ctx.Repo.Repository.CreateNewBranch(ctx.User, oldBranchName, branchName); err != nil {
+		ctx.Handle(404, "repo.Branches(CreateNewBranch)", err)
+		log.Error(4, "%s: %v", "EditFile", err)
+		return
+	}
+
+	// Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers
+	if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil {
+		log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err)
+	} else if commit, err := branch.GetCommit(); err != nil {
+		log.Error(4, "branch.GetCommit(): %v", err)
+	} else {
+		pc := &models.PushCommits{
+			Len: 1,
+			Commits: []*models.PushCommit{&models.PushCommit{
+				commit.ID.String(),
+				commit.Message(),
+				commit.Author.Email,
+				commit.Author.Name,
+			}},
+		}
+		oldCommitID := "0000000000000000000000000000000000000000" // New Branch so we use all 0s
+		newCommitID := commit.ID.String()
+		if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email,
+			ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc,
+			oldCommitID, newCommitID); err != nil {
+			log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err)
+		}
+		models.HookQueue.Add(ctx.Repo.Repository.ID)
+	}
+
+	ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + branchName))
+}
diff --git a/routers/repo/delete.go b/routers/repo/delete.go
new file mode 100644
index 0000000000..0aec7f1a1d
--- /dev/null
+++ b/routers/repo/delete.go
@@ -0,0 +1,54 @@
+// Copyright 2016 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/auth"
+	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/modules/log"
+)
+
+func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) {
+	branchName := ctx.Repo.BranchName
+	treeName := ctx.Repo.TreeName
+
+	if ctx.HasError() {
+		ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName)
+		return
+	}
+
+	if err := ctx.Repo.Repository.DeleteRepoFile(ctx.User, branchName, treeName, form.CommitSummary); err != nil {
+		ctx.Handle(500, "DeleteRepoFile", err)
+		return
+	}
+
+	// Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers
+	if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil {
+		log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err)
+	} else if commit, err := branch.GetCommit(); err != nil {
+		log.Error(4, "branch.GetCommit(): %v", err)
+	} else {
+		pc := &models.PushCommits{
+			Len: 1,
+			Commits: []*models.PushCommit{&models.PushCommit{
+				commit.ID.String(),
+				commit.Message(),
+				commit.Author.Email,
+				commit.Author.Name,
+			}},
+		}
+		oldCommitID := ctx.Repo.CommitID
+		newCommitID := commit.ID.String()
+		if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email,
+			ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc,
+			oldCommitID, newCommitID); err != nil {
+			log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err)
+		}
+		models.HookQueue.Add(ctx.Repo.Repository.ID)
+	}
+
+	ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName)
+}
diff --git a/routers/repo/edit.go b/routers/repo/edit.go
new file mode 100644
index 0000000000..d0cacd360e
--- /dev/null
+++ b/routers/repo/edit.go
@@ -0,0 +1,359 @@
+// Copyright 2016 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+	"io/ioutil"
+	"path"
+	"strings"
+
+	"github.com/gogits/git-module"
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/auth"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/modules/log"
+	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/modules/template"
+)
+
+const (
+	EDIT             base.TplName = "repo/edit"
+	DIFF_PREVIEW     base.TplName = "repo/diff_preview"
+	DIFF_PREVIEW_NEW base.TplName = "repo/diff_preview_new"
+)
+
+func EditFile(ctx *context.Context) {
+	editFile(ctx, false)
+}
+
+func NewFile(ctx *context.Context) {
+	editFile(ctx, true)
+}
+
+func editFile(ctx *context.Context, isNewFile bool) {
+	ctx.Data["PageIsEdit"] = true
+	ctx.Data["IsNewFile"] = isNewFile
+	ctx.Data["RequireHighlightJS"] = true
+
+	userName := ctx.Repo.Owner.Name
+	repoName := ctx.Repo.Repository.Name
+	branchName := ctx.Repo.BranchName
+	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
+	treeName := ctx.Repo.TreeName
+
+	var treeNames []string
+	if len(treeName) > 0 {
+		treeNames = strings.Split(treeName, "/")
+	}
+
+	if !isNewFile {
+		entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName)
+
+		if err != nil && git.IsErrNotExist(err) {
+			ctx.Handle(404, "GetTreeEntryByPath", err)
+			return
+		}
+
+		if (ctx.Repo.IsViewCommit) || entry == nil || entry.IsDir() {
+			ctx.Handle(404, "repo.Home", nil)
+			return
+		}
+
+		blob := entry.Blob()
+
+		dataRc, err := blob.Data()
+		if err != nil {
+			ctx.Handle(404, "blob.Data", err)
+			return
+		}
+
+		ctx.Data["FileSize"] = blob.Size()
+		ctx.Data["FileName"] = blob.Name()
+
+		buf := make([]byte, 1024)
+		n, _ := dataRc.Read(buf)
+		if n > 0 {
+			buf = buf[:n]
+		}
+
+		_, isTextFile := base.IsTextFile(buf)
+
+		if !isTextFile {
+			ctx.Handle(404, "repo.Home", nil)
+			return
+		}
+
+		d, _ := ioutil.ReadAll(dataRc)
+		buf = append(buf, d...)
+
+		if err, content := template.ToUtf8WithErr(buf); err != nil {
+			if err != nil {
+				log.Error(4, "Convert content encoding: %s", err)
+			}
+			ctx.Data["FileContent"] = string(buf)
+		} else {
+			ctx.Data["FileContent"] = content
+		}
+	} else {
+		treeNames = append(treeNames, "")
+	}
+
+	ctx.Data["RequireSimpleMDE"] = true
+
+	ctx.Data["UserName"] = userName
+	ctx.Data["RepoName"] = repoName
+	ctx.Data["BranchName"] = branchName
+	ctx.Data["TreeName"] = treeName
+	ctx.Data["TreeNames"] = treeNames
+	ctx.Data["BranchLink"] = branchLink
+	ctx.Data["CommitSummary"] = ""
+	ctx.Data["CommitMessage"] = ""
+	ctx.Data["CommitChoice"] = "direct"
+	ctx.Data["NewBranchName"] = ""
+	ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+branchName+"</strong>")
+	ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>")
+	ctx.Data["LastCommit"] = ctx.Repo.Commit.ID
+	ctx.Data["MdFileExtensions"] = strings.Join(setting.Markdown.MdFileExtensions, ",")
+	ctx.Data["LineWrapExtensions"] = strings.Join(setting.Editor.LineWrapExtensions, ",")
+	ctx.Data["PreviewTabApis"] = strings.Join(setting.Editor.PreviewTabApis, ",")
+	ctx.Data["PreviewDiffUrl"] = ctx.Repo.RepoLink + "/preview/" + branchName + "/" + treeName
+
+	ctx.HTML(200, EDIT)
+}
+
+func EditFilePost(ctx *context.Context, form auth.EditRepoFileForm) {
+	editFilePost(ctx, form, false)
+}
+
+func NewFilePost(ctx *context.Context, form auth.EditRepoFileForm) {
+	editFilePost(ctx, form, true)
+}
+
+func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bool) {
+	ctx.Data["PageIsEdit"] = true
+	ctx.Data["IsNewFile"] = isNewFile
+	ctx.Data["RequireHighlightJS"] = true
+
+	userName := ctx.Repo.Owner.Name
+	repoName := ctx.Repo.Repository.Name
+	oldBranchName := ctx.Repo.BranchName
+	branchName := oldBranchName
+	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
+	oldTreeName := ctx.Repo.TreeName
+	content := form.Content
+	commitChoice := form.CommitChoice
+	lastCommit := form.LastCommit
+
+	if commitChoice == "commit-to-new-branch" {
+		branchName = form.NewBranchName
+	}
+
+	treeName := form.TreeName
+	treeName = strings.Trim(treeName, " ")
+	treeName = strings.Trim(treeName, "/")
+
+	var treeNames []string
+	if len(treeName) > 0 {
+		treeNames = strings.Split(treeName, "/")
+	}
+
+	ctx.Data["RequireSimpleMDE"] = true
+
+	ctx.Data["UserName"] = userName
+	ctx.Data["RepoName"] = repoName
+	ctx.Data["BranchName"] = branchName
+	ctx.Data["TreeName"] = treeName
+	ctx.Data["TreeNames"] = treeNames
+	ctx.Data["BranchLink"] = branchLink
+	ctx.Data["FileContent"] = content
+	ctx.Data["CommitSummary"] = form.CommitSummary
+	ctx.Data["CommitMessage"] = form.CommitMessage
+	ctx.Data["CommitChoice"] = commitChoice
+	ctx.Data["NewBranchName"] = branchName
+	ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+oldBranchName+"</strong>")
+	ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>")
+	ctx.Data["LastCommit"] = ctx.Repo.Commit.ID
+	ctx.Data["MdFileExtensions"] = strings.Join(setting.Markdown.MdFileExtensions, ",")
+	ctx.Data["LineWrapExtensions"] = strings.Join(setting.Editor.LineWrapExtensions, ",")
+	ctx.Data["PreviewTabApis"] = strings.Join(setting.Editor.PreviewTabApis, ",")
+	ctx.Data["PreviewDiffUrl"] = ctx.Repo.RepoLink + "/preview/" + branchName + "/" + treeName
+
+	if ctx.HasError() {
+		ctx.HTML(200, EDIT)
+		return
+	}
+
+	if len(treeName) == 0 {
+		ctx.Data["Err_Filename"] = true
+		ctx.RenderWithErr(ctx.Tr("repo.filename_cannot_be_empty"), EDIT, &form)
+		log.Error(4, "%s: %s", "EditFile", "Filename can't be empty")
+		return
+	}
+
+	if oldBranchName != branchName {
+		if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil {
+			ctx.Data["Err_Branchname"] = true
+			ctx.RenderWithErr(ctx.Tr("repo.branch_already_exists"), EDIT, &form)
+			log.Error(4, "%s: %s - %s", "BranchName", branchName, "Branch already exists")
+			return
+		}
+
+	}
+
+	treepath := ""
+	for index, part := range treeNames {
+		treepath = path.Join(treepath, part)
+		entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treepath)
+		if err != nil {
+			// Means there is no item with that name, so we're good
+			break
+		}
+		if index != len(treeNames)-1 {
+			if !entry.IsDir() {
+				ctx.Data["Err_Filename"] = true
+				ctx.RenderWithErr(ctx.Tr("repo.directory_is_a_file"), EDIT, &form)
+				log.Error(4, "%s: %s - %s", "EditFile", treeName, "Directory given is a file")
+				return
+			}
+		} else {
+			if entry.IsDir() {
+				ctx.Data["Err_Filename"] = true
+				ctx.RenderWithErr(ctx.Tr("repo.filename_is_a_directory"), EDIT, &form)
+				log.Error(4, "%s: %s - %s", "EditFile", treeName, "Filename given is a dirctory")
+				return
+			}
+		}
+	}
+
+	if !isNewFile {
+		_, err := ctx.Repo.Commit.GetTreeEntryByPath(oldTreeName)
+		if err != nil && git.IsErrNotExist(err) {
+			ctx.Data["Err_Filename"] = true
+			ctx.RenderWithErr(ctx.Tr("repo.file_editing_no_longer_exists"), EDIT, &form)
+			log.Error(4, "%s: %s / %s - %s", "EditFile", branchName, oldTreeName, "File doesn't exist for editing")
+			return
+		}
+		if lastCommit != ctx.Repo.CommitID {
+			if files, err := ctx.Repo.Commit.GetFilesChangedSinceCommit(lastCommit); err == nil {
+				for _, file := range files {
+					if file == treeName {
+						name := ctx.Repo.Commit.Author.Name
+						if u, err := models.GetUserByEmail(ctx.Repo.Commit.Author.Email); err == nil {
+							name = `<a href="` + setting.AppSubUrl + "/" + u.Name + `" target="_blank">` + u.Name + `</a>`
+						}
+						message := ctx.Tr("repo.user_has_committed_since_you_started_editing", name) +
+							` <a href="` + ctx.Repo.RepoLink + "/commit/" + ctx.Repo.CommitID + `" target="_blank">` + ctx.Tr("repo.see_what_changed") + `</a>` +
+							" " + ctx.Tr("repo.pressing_commit_again_will_overwrite_those_changes", "<em>"+ctx.Tr("repo.commit_changes")+"</em>")
+						log.Error(4, "%s: %s / %s - %s", "EditFile", branchName, oldTreeName, "File updated by another user")
+						ctx.RenderWithErr(message, EDIT, &form)
+						return
+					}
+				}
+			}
+		}
+	}
+	if oldTreeName != treeName {
+		// We have a new filename (rename or completely new file) so we need to make sure it doesn't already exist, can't clobber
+		_, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName)
+		if err == nil {
+			ctx.Data["Err_Filename"] = true
+			ctx.RenderWithErr(ctx.Tr("repo.file_already_exists"), EDIT, &form)
+			log.Error(4, "%s: %s - %s", "NewFile", treeName, "File already exists, can't create new")
+			return
+		}
+	}
+
+	message := ""
+	if form.CommitSummary != "" {
+		message = strings.Trim(form.CommitSummary, " ")
+	} else {
+		if isNewFile {
+			message = ctx.Tr("repo.add") + " '" + treeName + "'"
+		} else {
+			message = ctx.Tr("repo.update") + " '" + treeName + "'"
+		}
+	}
+	if strings.Trim(form.CommitMessage, " ") != "" {
+		message += "\n\n" + strings.Trim(form.CommitMessage, " ")
+	}
+
+	if err := ctx.Repo.Repository.UpdateRepoFile(ctx.User, oldBranchName, branchName, oldTreeName, treeName, content, message, isNewFile); err != nil {
+		ctx.Data["Err_Filename"] = true
+		ctx.RenderWithErr(ctx.Tr("repo.unable_to_update_file"), EDIT, &form)
+		log.Error(4, "%s: %v", "EditFile", err)
+		return
+	}
+
+	if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil {
+		log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err)
+	} else if commit, err := branch.GetCommit(); err != nil {
+		log.Error(4, "branch.GetCommit(): %v", err)
+	} else {
+		pc := &models.PushCommits{
+			Len: 1,
+			Commits: []*models.PushCommit{&models.PushCommit{
+				commit.ID.String(),
+				commit.Message(),
+				commit.Author.Email,
+				commit.Author.Name,
+			}},
+		}
+		oldCommitID := ctx.Repo.CommitID
+		newCommitID := commit.ID.String()
+		if branchName != oldBranchName {
+			oldCommitID = "0000000000000000000000000000000000000000" // New Branch so we use all 0s
+		}
+		if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email,
+			ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc,
+			oldCommitID, newCommitID); err != nil {
+			log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err)
+		}
+		models.HookQueue.Add(ctx.Repo.Repository.ID)
+	}
+
+	// Leaving this off until forked repos that get a branch can compare with forks master and not upstream
+	//if oldBranchName != branchName {
+	//	ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + branchName))
+	//} else {
+	ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName))
+	//}
+}
+
+func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) {
+	userName := ctx.Repo.Owner.Name
+	repoName := ctx.Repo.Repository.Name
+	branchName := ctx.Repo.BranchName
+	treeName := ctx.Repo.TreeName
+	content := form.Content
+
+	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treeName)
+	if (err != nil && git.IsErrNotExist(err)) || entry.IsDir() {
+		ctx.Data["FileContent"] = content
+		ctx.HTML(200, DIFF_PREVIEW_NEW)
+		return
+	}
+
+	diff, err := ctx.Repo.Repository.GetPreviewDiff(models.RepoPath(userName, repoName), branchName, treeName, content, setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
+	if err != nil {
+		ctx.Error(404, err.Error())
+		log.Error(4, "%s: %v", "GetPreviewDiff", err)
+		return
+	}
+
+	if diff.NumFiles() == 0 {
+		ctx.Error(200, ctx.Tr("repo.no_changes_to_show"))
+		return
+	}
+
+	ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split"
+	ctx.Data["File"] = diff.Files[0]
+
+	ctx.HTML(200, DIFF_PREVIEW)
+}
+
+func EscapeUrl(str string) string {
+	return strings.NewReplacer("?", "%3F", "%", "%25", "#", "%23", " ", "%20", "^", "%5E", "\\", "%5C", "{", "%7B", "}", "%7D", "|", "%7C").Replace(str)
+}
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index f3c0f19a87..b79ded5329 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -340,6 +340,8 @@ func NewIssue(ctx *context.Context) {
 	}
 
 	ctx.Data["RequireHighlightJS"] = true
+	ctx.Data["RequireSimpleMDE"] = true
+	ctx.Data["RepoName"] = ctx.Repo.Repository.Name
 
 	ctx.HTML(200, ISSUE_NEW)
 }
@@ -401,6 +403,9 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64
 func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) {
 	ctx.Data["Title"] = ctx.Tr("repo.issues.new")
 	ctx.Data["PageIsIssueList"] = true
+	ctx.Data["RepoName"] = ctx.Repo.Repository.Name
+	ctx.Data["RequireHighlightJS"] = true
+	ctx.Data["RequireSimpleMDE"] = true
 	renderAttachmentSettings(ctx)
 
 	var (
@@ -414,7 +419,7 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) {
 	}
 
 	if setting.AttachmentEnabled {
-		attachments = form.Attachments
+		attachments = form.Files
 	}
 
 	if ctx.HasError() {
@@ -634,6 +639,8 @@ func ViewIssue(ctx *context.Context) {
 	ctx.Data["SignInLink"] = setting.AppSubUrl + "/user/login?redirect_to=" + ctx.Data["Link"].(string)
 
 	ctx.Data["RequireHighlightJS"] = true
+	ctx.Data["RequireSimpleMDE"] = true
+	ctx.Data["RepoName"] = ctx.Repo.Repository.Name
 
 	ctx.HTML(200, ISSUE_VIEW)
 }
@@ -801,7 +808,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
 
 	var attachments []string
 	if setting.AttachmentEnabled {
-		attachments = form.Attachments
+		attachments = form.Files
 	}
 
 	if ctx.HasError() {
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 822d77c719..c7fee92906 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -660,7 +660,7 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm)
 	}
 
 	if setting.AttachmentEnabled {
-		attachments = form.Attachments
+		attachments = form.Files
 	}
 
 	if ctx.HasError() {
diff --git a/routers/repo/upload.go b/routers/repo/upload.go
new file mode 100644
index 0000000000..fedf4064d3
--- /dev/null
+++ b/routers/repo/upload.go
@@ -0,0 +1,257 @@
+// Copyright 2016 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+	"strings"
+
+	"fmt"
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/auth"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/context"
+	"github.com/gogits/gogs/modules/log"
+	"github.com/gogits/gogs/modules/setting"
+	"net/http"
+	"path"
+)
+
+const (
+	UPLOAD base.TplName = "repo/upload"
+)
+
+func renderUploadSettings(ctx *context.Context) {
+	ctx.Data["RequireDropzone"] = true
+	ctx.Data["IsUploadEnabled"] = setting.UploadEnabled
+	ctx.Data["UploadAllowedTypes"] = setting.UploadAllowedTypes
+	ctx.Data["UploadMaxSize"] = setting.UploadMaxSize
+	ctx.Data["UploadMaxFiles"] = setting.UploadMaxFiles
+}
+
+func UploadFile(ctx *context.Context) {
+	ctx.Data["PageIsUpload"] = true
+
+	userName := ctx.Repo.Owner.Name
+	repoName := ctx.Repo.Repository.Name
+	branchName := ctx.Repo.BranchName
+	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
+	treeName := ctx.Repo.TreeName
+
+	treeNames := []string{""}
+	if len(treeName) > 0 {
+		treeNames = strings.Split(treeName, "/")
+	}
+
+	ctx.Data["UserName"] = userName
+	ctx.Data["RepoName"] = repoName
+	ctx.Data["BranchName"] = branchName
+	ctx.Data["TreeName"] = treeName
+	ctx.Data["TreeNames"] = treeNames
+	ctx.Data["BranchLink"] = branchLink
+	ctx.Data["CommitSummary"] = ""
+	ctx.Data["CommitMessage"] = ""
+	ctx.Data["CommitChoice"] = "direct"
+	ctx.Data["NewBranchName"] = ""
+	ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+branchName+"</strong>")
+	ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>")
+	renderUploadSettings(ctx)
+
+	ctx.HTML(200, UPLOAD)
+}
+
+func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) {
+	ctx.Data["PageIsUpload"] = true
+	renderUploadSettings(ctx)
+
+	userName := ctx.Repo.Owner.Name
+	repoName := ctx.Repo.Repository.Name
+	oldBranchName := ctx.Repo.BranchName
+	branchName := oldBranchName
+	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
+	commitChoice := form.CommitChoice
+	files := form.Files
+
+	if commitChoice == "commit-to-new-branch" {
+		branchName = form.NewBranchName
+	}
+
+	treeName := form.TreeName
+	treeName = strings.Trim(treeName, " ")
+	treeName = strings.Trim(treeName, "/")
+
+	treeNames := []string{""}
+	if len(treeName) > 0 {
+		treeNames = strings.Split(treeName, "/")
+	}
+
+	ctx.Data["UserName"] = userName
+	ctx.Data["RepoName"] = repoName
+	ctx.Data["BranchName"] = branchName
+	ctx.Data["TreeName"] = treeName
+	ctx.Data["TreeNames"] = treeNames
+	ctx.Data["BranchLink"] = branchLink
+	ctx.Data["CommitSummary"] = form.CommitSummary
+	ctx.Data["CommitMessage"] = form.CommitMessage
+	ctx.Data["CommitChoice"] = commitChoice
+	ctx.Data["NewBranchName"] = branchName
+	ctx.Data["CommitDirectlyToThisBranch"] = ctx.Tr("repo.commit_directly_to_this_branch", "<strong class=\"branch-name\">"+oldBranchName+"</strong>")
+	ctx.Data["CreateNewBranch"] = ctx.Tr("repo.create_new_branch", "<strong>"+ctx.Tr("repo.new_branch")+"</strong>")
+
+	if ctx.HasError() {
+		ctx.HTML(200, UPLOAD)
+		return
+	}
+
+	if oldBranchName != branchName {
+		if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil {
+			ctx.Data["Err_Branchname"] = true
+			ctx.RenderWithErr(ctx.Tr("repo.branch_already_exists"), UPLOAD, &form)
+			log.Error(4, "%s: %s - %s", "BranchName", branchName, "Branch already exists")
+			return
+		}
+
+	}
+
+	treepath := ""
+	for _, part := range treeNames {
+		treepath = path.Join(treepath, part)
+		entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treepath)
+		if err != nil {
+			// Means there is no item with that name, so we're good
+			break
+		}
+		if !entry.IsDir() {
+			ctx.Data["Err_Filename"] = true
+			ctx.RenderWithErr(ctx.Tr("repo.directory_is_a_file"), UPLOAD, &form)
+			log.Error(4, "%s: %s - %s", "UploadFile", treeName, "Directory given is a file")
+			return
+		}
+	}
+
+	message := ""
+	if form.CommitSummary != "" {
+		message = strings.Trim(form.CommitSummary, " ")
+	} else {
+		message = ctx.Tr("repo.add_files_to_dir", "'"+treeName+"'")
+	}
+	if strings.Trim(form.CommitMessage, " ") != "" {
+		message += "\n\n" + strings.Trim(form.CommitMessage, " ")
+	}
+
+	if err := ctx.Repo.Repository.UploadRepoFiles(ctx.User, oldBranchName, branchName, treeName, message, files); err != nil {
+		ctx.Data["Err_Directory"] = true
+		ctx.RenderWithErr(ctx.Tr("repo.unable_to_upload_files"), UPLOAD, &form)
+		log.Error(4, "%s: %v", "UploadFile", err)
+		return
+	}
+
+	// Was successful, so now need to call models.CommitRepoAction() with the new commitID for webhooks and watchers
+	if branch, err := ctx.Repo.Repository.GetBranch(branchName); err != nil {
+		log.Error(4, "repo.Repository.GetBranch(%s): %v", branchName, err)
+	} else if commit, err := branch.GetCommit(); err != nil {
+		log.Error(4, "branch.GetCommit(): %v", err)
+	} else {
+		pc := &models.PushCommits{
+			Len: 1,
+			Commits: []*models.PushCommit{&models.PushCommit{
+				commit.ID.String(),
+				commit.Message(),
+				commit.Author.Email,
+				commit.Author.Name,
+			}},
+		}
+		oldCommitID := ctx.Repo.CommitID
+		newCommitID := commit.ID.String()
+		if branchName != oldBranchName {
+			oldCommitID = "0000000000000000000000000000000000000000" // New Branch so we use all 0s
+		}
+		if err := models.CommitRepoAction(ctx.User.ID, ctx.Repo.Owner.ID, ctx.User.LowerName, ctx.Repo.Owner.Email,
+			ctx.Repo.Repository.ID, ctx.Repo.Owner.LowerName, ctx.Repo.Repository.Name, "refs/heads/"+branchName, pc,
+			oldCommitID, newCommitID); err != nil {
+			log.Error(4, "models.CommitRepoAction(branch = %s): %v", branchName, err)
+		}
+		models.HookQueue.Add(ctx.Repo.Repository.ID)
+	}
+
+	// Leaving this off until forked repos that get a branch can compare with forks master and not upstream
+	//if oldBranchName != branchName {
+	//	ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/compare/" + oldBranchName + "..." + branchName))
+	//} else {
+	ctx.Redirect(EscapeUrl(ctx.Repo.RepoLink + "/src/" + branchName + "/" + treeName))
+	//}
+}
+
+func UploadFileToServer(ctx *context.Context) {
+	if !setting.UploadEnabled {
+		ctx.Error(404, "upload is not enabled")
+		return
+	}
+
+	file, header, err := ctx.Req.FormFile("file")
+	if err != nil {
+		ctx.Error(500, fmt.Sprintf("FormFile: %v", err))
+		return
+	}
+	defer file.Close()
+
+	buf := make([]byte, 1024)
+	n, _ := file.Read(buf)
+	if n > 0 {
+		buf = buf[:n]
+	}
+	fileType := http.DetectContentType(buf)
+
+	if len(setting.UploadAllowedTypes) > 0 {
+		allowedTypes := strings.Split(setting.UploadAllowedTypes, ",")
+		allowed := false
+		for _, t := range allowedTypes {
+			t := strings.Trim(t, " ")
+			if t == "*/*" || t == fileType {
+				allowed = true
+				break
+			}
+		}
+
+		if !allowed {
+			ctx.Error(400, ErrFileTypeForbidden.Error())
+			return
+		}
+	}
+
+	up, err := models.NewUpload(header.Filename, buf, file, ctx.User.ID, ctx.Repo.Repository.ID)
+	if err != nil {
+		ctx.Error(500, fmt.Sprintf("NewUpload: %v", err))
+		return
+	}
+
+	log.Trace("New file uploaded: %s", up.UUID)
+	ctx.JSON(200, map[string]string{
+		"uuid": up.UUID,
+	})
+}
+
+func RemoveUploadFileFromServer(ctx *context.Context, form auth.RemoveUploadFileForm) {
+	if !setting.UploadEnabled {
+		ctx.Error(404, "upload is not enabled")
+		return
+	}
+
+	if len(form.File) == 0 {
+		ctx.Error(404, "invalid params")
+		return
+	}
+
+	uuid := form.File
+
+	if err := models.RemoveUpload(uuid, ctx.User.ID, ctx.Repo.Repository.ID); err != nil {
+		ctx.Error(500, fmt.Sprintf("RemoveUpload: %v", err))
+		return
+	}
+
+	log.Trace("Upload file removed: %s", uuid)
+	ctx.JSON(200, map[string]string{
+		"uuid": uuid,
+	})
+}
diff --git a/routers/repo/view.go b/routers/repo/view.go
index e685597a55..08ee16df1a 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -24,6 +24,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 	"github.com/gogits/gogs/modules/template"
 	"github.com/gogits/gogs/modules/template/highlight"
+	"strconv"
 )
 
 const (
@@ -40,6 +41,7 @@ func Home(ctx *context.Context) {
 	ctx.Data["Title"] = title
 	ctx.Data["PageIsViewCode"] = true
 	ctx.Data["RequireHighlightJS"] = true
+	ctx.Data["IsWriter"] = ctx.Repo.IsWriter()
 
 	branchName := ctx.Repo.BranchName
 	userName := ctx.Repo.Owner.Name
@@ -49,6 +51,11 @@ func Home(ctx *context.Context) {
 	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
 	treeLink := branchLink
 	rawLink := ctx.Repo.RepoLink + "/raw/" + branchName
+	editLink := ctx.Repo.RepoLink + "/_edit/" + branchName
+	newFileLink := ctx.Repo.RepoLink + "/_new/" + branchName
+	deleteLink := ctx.Repo.RepoLink + "/delete/" + branchName
+	forkLink := setting.AppSubUrl + "/repo/fork/" + strconv.FormatInt(ctx.Repo.Repository.ID, 10)
+	uploadFileLink := ctx.Repo.RepoLink + "/upload/" + branchName
 
 	// Get tree path
 	treename := ctx.Repo.TreeName
@@ -104,8 +111,10 @@ func Home(ctx *context.Context) {
 			switch {
 			case isPDFFile:
 				ctx.Data["IsPDFFile"] = true
+				ctx.Data["FileEditLinkTooltip"] = ctx.Tr("repo.cannot_edit_binary_files")
 			case isImageFile:
 				ctx.Data["IsImageFile"] = true
+				ctx.Data["FileEditLinkTooltip"] = ctx.Tr("repo.cannot_edit_binary_files")
 			case isTextFile:
 				if blob.Size() >= setting.UI.MaxDisplayFileSize {
 					ctx.Data["IsFileTooLarge"] = true
@@ -114,8 +123,10 @@ func Home(ctx *context.Context) {
 					d, _ := ioutil.ReadAll(dataRc)
 					buf = append(buf, d...)
 					readmeExist := markdown.IsMarkdownFile(blob.Name()) || markdown.IsReadmeFile(blob.Name())
+					isMarkdown := readmeExist || markdown.IsMarkdownFile(blob.Name())
 					ctx.Data["ReadmeExist"] = readmeExist
-					if readmeExist {
+					ctx.Data["IsMarkdown"] = isMarkdown
+					if isMarkdown {
 						ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
 					} else {
 						// Building code view blocks with line number on server side.
@@ -143,6 +154,29 @@ func Home(ctx *context.Context) {
 						ctx.Data["LineNums"] = gotemplate.HTML(output.String())
 					}
 				}
+				if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
+					ctx.Data["FileEditLink"] = editLink + "/" + treename
+					ctx.Data["FileEditLinkTooltip"] = ctx.Tr("repo.edit_this_file")
+				} else {
+					if !ctx.Repo.IsViewBranch {
+						ctx.Data["FileEditLinkTooltip"] = ctx.Tr("repo.must_be_on_branch")
+					} else if !ctx.Repo.IsWriter() {
+						ctx.Data["FileEditLink"] = forkLink
+						ctx.Data["FileEditLinkTooltip"] = ctx.Tr("repo.fork_before_edit")
+					}
+				}
+			default:
+				ctx.Data["FileEditLinkTooltip"] = ctx.Tr("repo.cannot_edit_binary_files")
+			}
+			if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
+				ctx.Data["FileDeleteLink"] = deleteLink + "/" + treename
+				ctx.Data["FileDeleteLinkTooltip"] = ctx.Tr("repo.delete_this_file")
+			} else {
+				if !ctx.Repo.IsViewBranch {
+					ctx.Data["FileDeleteLinkTooltip"] = ctx.Tr("repo.must_be_on_branch")
+				} else if !ctx.Repo.IsWriter() {
+					ctx.Data["FileDeleteLinkTooltip"] = ctx.Tr("repo.must_be_writer")
+				}
 			}
 		}
 	} else {
@@ -200,6 +234,7 @@ func Home(ctx *context.Context) {
 					buf = append(buf, d...)
 					switch {
 					case markdown.IsMarkdownFile(readmeFile.Name()):
+						ctx.Data["IsMarkdown"] = true
 						buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas())
 					default:
 						buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1)
@@ -220,6 +255,12 @@ func Home(ctx *context.Context) {
 		}
 		ctx.Data["LastCommit"] = lastCommit
 		ctx.Data["LastCommitUser"] = models.ValidateCommitWithEmail(lastCommit)
+		if ctx.Repo.IsWriter() && ctx.Repo.IsViewBranch {
+			ctx.Data["NewFileLink"] = newFileLink + "/" + treename
+			if setting.UploadEnabled {
+				ctx.Data["UploadFileLink"] = uploadFileLink + "/" + treename
+			}
+		}
 	}
 
 	ctx.Data["Username"] = userName