Merge branch 'dev' of https://github.com/jh8579/fileshell_cloudcomputing into dev

# Conflicts:
#	fileshell/models.py
#	fileshell/settings.py
#	fileshell/urls.py
#	fileshell/views.py
#	templates/base.html

@@ -88,7 +88,7 @@
     <script src="{% static 'js/dropzone.js' %}"></script>
     <script src="{% static 'js/dropzone.js' %}"></script>
     <script type="text/javascript">
     <script type="text/javascript">
         Dropzone.options.dropzone = {
         Dropzone.options.dropzone = {
-            maxFilesize: 10, // Mb
+            maxFilesize: 100000000, // Mb
             init: function() {
             init: function() {
                 this.on('success', function(){
                 this.on('success', function(){
                     if (this.getQueuedFiles().length == 0 && this.getUploadingFiles().length == 0) {
                     if (this.getQueuedFiles().length == 0 && this.getUploadingFiles().length == 0) {