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

2 files changed, 75 insertions, 0 deletions

diff --git a/conf/app.ini b/conf/app.ini
index ea0ca16295..515269a764 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -20,6 +20,26 @@ MAX_CREATION_LIMIT = -1
 ; Patch test queue length, make it as large as possible
 PULL_REQUEST_QUEUE_LENGTH = 10000
 
+[editor]
+; List of file extensions that should have line wraps in the CodeMirror editor
+; Separate extensions with a comma. To line wrap files w/o extension, just put a comma
+LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
+; Valid file modes that have a preview API associated with them, such as api/v1/markdown
+; Separate values by commas. Preview tab in edit mode won't show if the file extension doesn't match
+PREVIEW_TAB_APIS = markdown
+
+[upload]
+; Whether repository file uploads are enabled. Defaults to `true`
+ENABLE_UPLOADS = true
+; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gogs restart)
+TEMP_PATH = data/tmp/uploads
+; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
+ALLOWED_TYPES =
+; Max size of each file in MB. Defaults to 32MB
+FILE_MAX_SIZE = 32
+; Max number of files per upload. Defaults to 10
+MAX_FILES = 10
+
 [ui]
 ; Number of repositories that are showed in one explore page
 EXPLORE_PAGING_NUM = 20
@@ -54,6 +74,9 @@ ENABLE_HARD_LINE_BREAK = false
 ; List of custom URL-Schemes that are allowed as links when rendering Markdown
 ; for example git,magnet
 CUSTOM_URL_SCHEMES =
+; List of file extensions that should be rendered/edited as Markdown
+; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
+MD_FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
 
 [server]
 PROTOCOL = http
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index ceb9779769..9dbb71f183 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -189,6 +189,13 @@ TeamName = Team name
 AuthName = Authorization name
 AdminEmail = Admin email
 
+NewBranchName = New branch name
+CommitSummary = Commit summary
+CommitMessage = Commit message
+CommitChoice = Commit choice
+TreeName = File path
+Content = Content
+
 require_error = ` cannot be empty.`
 alpha_dash_error = ` must be valid alpha or numeric or dash(-_) characters.`
 alpha_dash_dot_error = ` must be valid alpha or numeric or dash(-_) or dot characters.`
@@ -419,6 +426,51 @@ file_view_raw = View Raw
 file_permalink = Permalink
 file_too_large = This file is too large to be shown
 
+cancel = Cancel
+cancel_lower = cancel
+or = or
+new_file = New file
+upload_files = Upload files
+find_file = Find file
+commit_changes = Commit Changes
+default_commit_message = Add an optional extended description...
+last_commit_info = %s edited this file %s
+delete_this_file = Delete this file
+edit_this_file = Edit this file
+edit_file = Edit file
+delete_confirm_message = Are you sure you want to delete this file?
+delete_commit_message = Write a note about this delete (optional)
+file_editing_no_longer_exists = The file you are editing no longer exists in the repository
+file_already_exists = A file by that name already exists
+unable_to_update_file = Unable to update this file, error occurred
+add = Add
+update = Update
+filename_cannot_be_empty = Filename cannot be empty
+directory_is_a_file = One of the directories in the path is already a file in this repository
+filename_is_a_directory = The filename given is an existing directory in the repository
+must_be_on_branch = You must be on a branch to make or propose changes to this file
+must_be_writer = You must have write access to make or propose changes to this file
+cannot_edit_binary_files = Cannot edit binary files
+filename_help = To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+fork_before_edit = You must fork this before editing
+branch_already_exists = Branch already exists
+create_new_branch = Create a %s for this commit and start a pull request.
+new_branch = new branch
+commit_directly_to_this_branch = Commit directly to the %s branch.
+create_branch = Create branch
+from = from
+upload_file = Upload file
+add_files_to_dir = Add files to %s
+unable_to_upload_files = Unable to upload files, an error occurred.
+add_subdir = Add subdirectory...
+name_your_file = Name your file...
+user_has_committed_since_you_started_editing = %s has committed since you started editing.
+see_what_changed = See what changed.
+pressing_commit_again_will_overwrite_those_changes = Pressing '%s' again will overwrite those changes.
+copy_file_path_to_clipboard = Copy file path to clipboard
+preview_changes = Preview Changes
+no_changes_to_show = There are no changes to show.
+
 commits.commits = Commits
 commits.search = Search commits
 commits.find = Find