finished up some stuff
Merge remote-tracking branch 'origin/eric' into bala
finished report a problem making keyboard disappear
Merge remote-tracking branch 'origin/eric' into bala