changes to upload flow
Merge remote-tracking branch 'origin/master' into bala
are you kidding me
Merge remote-tracking branch 'origin/eric' into bala
added icons for everything