KJLJon/file-uploader — pull request #1 by KJLJon (2012-12-12 13:00:09+00:00)
Title: Merging Master -> patch-3 (to fix conflicts)

merging server to my branch (I hope)