Git branch and merge

[hitz]

We need to commit the current production code into a new branch, and then merge this branch any changes in development (should be almost none). Then reactivate the file upload for testing in a dev server.