upload fragment no longer shifts layout with soft keyboard
upload layout improved
Merge branch 'grant' into eric
upload layout
Merge branch 'grant' into eric