Fix key upload
Fix file upload popup css and cleaning up of controller
Merge pull request #240 from mistio/fix_key_upload

Fix key upload