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

@@ -144,7 +144,7 @@ def upload(request):
     if request.method == 'POST':
     if request.method == 'POST':
 
 
         ## 파일 model 변수 초기화
         ## 파일 model 변수 초기화
-        filedata = request.FILES['source-file']
+        filedata = request.FILES.get('source-file')
         title = request.FILES.get('source-file')
         title = request.FILES.get('source-file')
         user = request.user
         user = request.user
         user_name = request.user.username
         user_name = request.user.username