finished rest of upload (somewhat), missing icons
Merge branch 'bala' into eric