Remove UpdateShortTrap method.
Merge branch 'dev' of http://github.com/rami1942/fxc into dev
Merge branch 'dev' of http://github.com/rami1942/fxc into dev